diff options
author | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
commit | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (patch) | |
tree | 6b4b6de1185b25f8e6071b3204fcb69762bdc0ac /packages.txt | |
parent | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (diff) | |
parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
download | vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.gz vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.bz2 vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
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 88798b2ad..f6e1e8bd2 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.0e
+openssl-1.0.0g
pixman git version
pthreads-w32 cvs version
randrproto git version
|