diff options
author | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-03-28 17:43:20 +0100 |
commit | f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd (patch) | |
tree | afbeb028495328a2817aedbac7aae484a2c71a83 /packages.txt | |
parent | bf0cbcc1d00962ef2221cb4ceae87cc5ae737454 (diff) | |
parent | cbfb19790917d271b8ca6156554b16acc802719f (diff) | |
download | vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.gz vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.tar.bz2 vcxsrv-f0f09f4aa3cdd0267f58b362a7c9fc5ae0921afd.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/xtrans/Xtrans.c
Diffstat (limited to 'packages.txt')
-rw-r--r-- | packages.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages.txt b/packages.txt index 56a8e44ca..c5e5d8657 100644 --- a/packages.txt +++ b/packages.txt @@ -54,7 +54,7 @@ libXau git version libXaw-1.0.12
libXdmcp git version
libXext git version
-libXfont-1.4.6
+libXfont-1.4.7
libXft git version
libXinerama git version
libXmu git version
@@ -90,7 +90,7 @@ xineramaproto-1.2.1 xkbcomp git version
xkeyboard-config git version
xrdb git version
-xproto-7.0.24
+xproto-7.0.25
xserver git version
xtrans git version
xwininfo git version
|