vcxsrv/libfontenc/src, branch 1.13.1.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.13.1.0
2012-11-19T09:38:33+00:00
Merge remote-tracking branch 'origin/released'
2012-11-19T09:38:33+00:00
marha
marha@users.sourceforge.net
2012-11-19T09:38:33+00:00
urn:sha1:24635abae6008bef13e30d798b3f33abab412770
* origin/released:
Changed file permissions
dos -> unix
Conflicts:
libX11/include/X11/Xregion.h
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/StrKeysym.c
libX11/src/Window.c
libX11/src/xkb/XKBBind.c
libX11/src/xkb/XKBGetMap.c
libX11/src/xkb/XKBSetGeom.c
libX11/src/xkb/XKBUse.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libXdmcp/Key.c
libXdmcp/Write.c
libxcb/src/xcb_windefs.h
xkbcomp/keycodes.c
xkbcomp/xkbpath.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
xorg-server/xkeyboard-config/rules/bin/ml_s.sh
xorg-server/xkeyboard-config/rules/bin/mln_s.sh
xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
dos -> unix
2012-11-19T09:16:38+00:00
marha
marha@users.sourceforge.net
2012-11-19T09:16:38+00:00
urn:sha1:3744281b9ae8aa0ab86ceaee1afe8a603e3aeb2c
Merge remote-tracking branch 'origin/released'
2012-04-30T09:11:16+00:00
marha
marha@users.sourceforge.net
2012-04-30T09:11:16+00:00
urn:sha1:0f0386d4e90cb0769eddc04b18742d5a9a72ea05
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/glx/glapi_gentable.c
fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012
2012-04-30T08:36:15+00:00
marha
marha@users.sourceforge.net
2012-04-30T08:36:15+00:00
urn:sha1:762b7fde3d57d3a151f98535fd31516b7e823bc0
Merge remote-tracking branch 'origin/released'
2011-11-14T08:42:43+00:00
marha
marha@users.sourceforge.net
2011-11-14T08:42:43+00:00
urn:sha1:93795f7d8ca73dd428a926901cbc632015ac0cf5
Conflicts:
libX11/src/util/makekeys.c
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
2011-11-14T08:38:56+00:00
marha
marha@users.sourceforge.net
2011-11-14T08:38:56+00:00
urn:sha1:156e37d3879b316329e3e05579414031da2647e2
14 nov 2011
Merge remote-tracking branch 'origin/released'
2011-09-19T11:39:03+00:00
marha
marha@users.sourceforge.net
2011-09-19T11:39:03+00:00
urn:sha1:1678a69116d1c6ce900fe15f7813613bb28416dd
Conflicts:
libfontenc/src/fontenc.c
xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc
2011-09-19T11:23:24+00:00
marha
marha@users.sourceforge.net
2011-09-19T11:23:24+00:00
urn:sha1:b2c925e360e2c366526de15b44603f855f94139c
mesa git update 19 sept 2011
Synchronised line endinge with release branch
2011-09-12T09:27:51+00:00
marha
marha@users.sourceforge.net
2011-09-12T09:27:51+00:00
urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0
svn merge ^/branches/released .
2011-05-10T13:36:25+00:00
marha
marha@users.sourceforge.net
2011-05-10T13:36:25+00:00
urn:sha1:2e5094b5a8e6241621cbf8c3e41b618347de7e2f