vcxsrv/libX11/modules/om, branch 1.12.2.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.12.2.0
2012-06-08T12:50:37+00:00
Merge remote-tracking branch 'origin/released'
2012-06-08T12:50:37+00:00
marha
marha@users.sourceforge.net
2012-06-08T12:29:46+00:00
urn:sha1:72ec0e3bb2d7fc6b77b2a75873792f781679da6a
Conflicts:
fontconfig/.gitignore
libX11/src/ConvSel.c
libX11/src/CrGlCur.c
libX11/src/CrWindow.c
libX11/src/GetDflt.c
libX11/src/Window.c
libX11/src/xlibi18n/XimProto.h
libX11/src/xlibi18n/lcDynamic.c
libxcb/src/.gitignore
libxcb/src/xcb_ext.c
libxcb/src/xcb_xid.c
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mapi/glapi/glapi_getproc.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/program/.gitignore
xkbcomp/listing.c
xkbcomp/xkbpath.c
xorg-server/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/winpriv.h
xorg-server/hw/xwin/winprefsyacc.y
xorg-server/hw/xwin/winscrinit.c
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/mlv_s.sh
xorg-server/xkeyboard-config/rules/compat/.gitignore
Used synchronise script to update files
2012-06-08T07:33:13+00:00
marha
marha@users.sourceforge.net
2012-06-08T07:33:13+00:00
urn:sha1:990bc3f015a4f8fce2eb918375defcd44980a845
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
Removed compile time warnings
2011-05-09T10:21:35+00:00
marha
marha@users.sourceforge.net
2011-05-09T10:21:35+00:00
urn:sha1:16c01fa941df4711a1e58dd2c05aa8ded5f1a442
svn merge ^/branches/released .
2011-04-27T15:56:59+00:00
marha
marha@users.sourceforge.net
2011-04-27T15:56:59+00:00
urn:sha1:100633b3e7619842f345cb7603b0db6b5761dd11
xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011
2011-04-27T06:58:32+00:00
marha
marha@users.sourceforge.net
2011-04-27T06:58:32+00:00
urn:sha1:96d6df5da9cddedf4931bf8e17f96e242467c661
svn merge ^/branches/released .
2011-04-15T15:08:38+00:00
marha
marha@users.sourceforge.net
2011-04-15T15:08:38+00:00
urn:sha1:205a4bdae76f287126db9f45a4f0ba631e3efca1
xserver xkeyboard-config libX11 mesa git update 15 April 2011
2011-04-15T14:48:46+00:00
marha
marha@users.sourceforge.net
2011-04-15T14:48:46+00:00
urn:sha1:71372d36e1a3f0230b88808f70d35446fda12260
XKB_INSERVER is already defined in main makefile
2011-03-15T06:58:28+00:00
marha
marha@users.sourceforge.net
2011-03-15T06:58:28+00:00
urn:sha1:01d9c04232c36059c06b7e34b4b00e6a66589e2b
svn merge ^/branches/released .
2010-06-11T15:12:35+00:00
marha
marha@users.sourceforge.net
2010-06-11T15:12:35+00:00
urn:sha1:bb9571d3ede4adbb9396fdb25ab8e3e91aba1479