diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
| commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
| tree | c800a66664ea3af61eb13928db45a26275930b0b /packages.txt | |
| parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'packages.txt')
| -rw-r--r-- | packages.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages.txt b/packages.txt index f641d1e72..c9c153ad9 100644 --- a/packages.txt +++ b/packages.txt @@ -65,7 +65,7 @@ libxcb git version libxkbfile-1.0.7
mesa git version
mkfontscale git version
-openssl-1.0.0g
+openssl-1.0.1
pixman git version
pthreads-w32 cvs version
randrproto git version
|