diff options
author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /packages.txt | |
parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'packages.txt')
-rw-r--r-- | packages.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages.txt b/packages.txt index 5abe26377..1f28e0485 100644 --- a/packages.txt +++ b/packages.txt @@ -44,13 +44,13 @@ font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
fontconfig git version
fontsproto-2.1.2
-freetype-2.4.9
+freetype-2.4.10
glproto git version
inputproto-2.2
kbproto-1.0.6
libX11 git version
libXau git version
-libXaw-1.0.10
+libXaw-1.0.11
libXdmcp git version
libXext git version
libXfont-1.4.5
@@ -65,7 +65,7 @@ libxcb git version libxkbfile-1.0.8
mesa git version
mkfontscale git version
-openssl-1.0.1
+openssl-1.0.1c
pixman git version
pthreads-w32 cvs version
randrproto git version
|