vcxsrv/xorg-server/xkb, branch 1.10.3.1
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.1
2011-07-15T09:32:48+00:00
Merge remote-tracking branch 'origin/released'
2011-07-15T09:32:48+00:00
marha
marha@users.sourceforge.net
2011-07-15T09:32:48+00:00
urn:sha1:3fbadc13acf6beb4a2497970367e2c2c1b6039ca
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
xserver libX11 mesa git update 15 July
2011-07-15T09:25:17+00:00
marha
marha@users.sourceforge.net
2011-07-15T09:25:17+00:00
urn:sha1:2ce12f084113a0097fa1a0d67e2f8fe1ab70092b
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 remote-tracking branch 'origin/released'
2011-06-06T08:36:17+00:00
marha
marha@users.sourceforge.net
2011-06-06T08:36:17+00:00
urn:sha1:336e4aab196609a528213e9ecebcb30fce7aa654
Conflicts:
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/test/xi2/protocol-common.c
xorg-server/xkb/xkbfmisc.c
mesa xserver xkb git update 6 Jun 2011
2011-06-06T08:30:26+00:00
marha
marha@users.sourceforge.net
2011-06-06T08:30:26+00:00
urn:sha1:416761431e76dcb053fa3447b6d53051579dad0a
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