vcxsrv/xorg-server/Xi, branch 1.10.3.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.0
2011-06-15T14:59:33+00:00
Merge remote-tracking branch 'origin/released'
2011-06-15T14:59:33+00:00
marha
marha@users.sourceforge.net
2011-06-15T14:59:33+00:00
urn:sha1:6cba1e57f303d9b90add32c5e942375826fb1ab2
Conflicts:
mesalib/docs/news.html
mesalib/docs/relnotes.html
mesalib/src/mesa/state_tracker/st_atom_blend.c
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/include/dix.h
mesa xserver git update 15 June 2011
2011-06-15T14:50:54+00:00
marha
marha@users.sourceforge.net
2011-06-15T14:50:54+00:00
urn:sha1:0e661faf8cf2e3460b5e2389414f99c035ad4d6a
__func__ is not defined in VC
2011-06-08T06:30:36+00:00
marha
marha@users.sourceforge.net
2011-06-08T06:30:36+00:00
urn:sha1:d2ed530d3df14e801ddad120b26b2969c1a12c24
Replace it by the __FUNCTION__ macro
Merge remote-tracking branch 'origin/released'
2011-06-08T06:28:34+00:00
marha
marha@users.sourceforge.net
2011-06-08T06:28:34+00:00
urn:sha1:414e95994496b7026621c7e4f6d01b364b5252b7
Conflicts:
libX11/specs/libX11/AppC.xml
libX11/specs/libX11/AppD.xml
libX11/specs/libX11/CH02.xml
libX11/specs/libX11/CH03.xml
libX11/specs/libX11/CH04.xml
libX11/specs/libX11/CH05.xml
libX11/specs/libX11/CH06.xml
libX11/specs/libX11/CH07.xml
libX11/specs/libX11/CH08.xml
libX11/specs/libX11/CH09.xml
libX11/specs/libX11/CH11.xml
libX11/specs/libX11/CH13.xml
libX11/specs/libX11/CH14.xml
libX11/specs/libX11/CH15.xml
libX11/specs/libX11/CH16.xml
mesalib/src/mesa/main/fbobject.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/test/input.c
xorg-server/xkb/xkbfmisc.c
xserver libX11 mesa git update 8 Jun 2011
2011-06-08T06:21:55+00:00
marha
marha@users.sourceforge.net
2011-06-08T06:21:55+00:00
urn:sha1:adeb8256da9b636648178f729d7b3316a0a8e990
merge ^/branches/released .
2011-05-16T09:49:27+00:00
marha
marha@users.sourceforge.net
2011-05-16T09:49:27+00:00
urn:sha1:ab5c2d2c78273ccdc7c9734bcba482a33fcf9652
xserver xkeyboar-config mesa git update 16 May 2011
2011-05-16T08:06:12+00:00
marha
marha@users.sourceforge.net
2011-05-16T08:06:12+00:00
urn:sha1:08cbf3b50bfe713044f36b363c73768cd042f13c
svn merge ^/branches/released .
2011-04-28T11:14:32+00:00
marha
marha@users.sourceforge.net
2011-04-28T11:14:32+00:00
urn:sha1:1840c5631682e0a69ed11487a23a43d45f2d15e1
xserver xkeyboard-config mesa git update 28 Apr 2011
2011-04-28T07:58:00+00:00
marha
marha@users.sourceforge.net
2011-04-28T07:58:00+00:00
urn:sha1:57a879849643e79d9674198a3a77c59532fb79b4
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