vcxsrv/xorg-server/os, branch 1.11.2.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0
2011-10-19T10:11:26+00:00
Merge remote-tracking branch 'origin/released'
2011-10-19T10:11:26+00:00
marha
marha@users.sourceforge.net
2011-10-19T10:11:26+00:00
urn:sha1:1e90ede4237374dfbb2c8c506a906233bcfd3c5d
Conflicts:
xorg-server/include/os.h
libX11 libXext libXft mesa libxcb mkfontscale pixman xserver
2011-10-19T08:44:43+00:00
marha
marha@users.sourceforge.net
2011-10-19T08:44:43+00:00
urn:sha1:9f986778bd4393c5a9108426969d45aa7f10f334
xkeyboard-config git update 19 oct 2011
Solved compile warning
2011-10-06T07:57:40+00:00
marha
marha@users.sourceforge.net
2011-10-06T07:57:40+00:00
urn:sha1:fa9e5aaaad0202347791636c9a1af2a904bc1c5e
commented out not needed line
2011-10-06T07:03:40+00:00
marha
marha@users.sourceforge.net
2011-10-06T07:03:40+00:00
urn:sha1:359c005eabc43d88fc0c102b0691d1647d15494c
Do not use LockFile as a variable name since it gives a name collision with
2011-09-27T07:10:40+00:00
marha
marha@users.sourceforge.net
2011-09-27T07:10:40+00:00
urn:sha1:756ccf7af09d35176962e44587244580c2cd0f22
microsoft header files
Merge remote-tracking branch 'origin/released'
2011-09-27T06:37:02+00:00
marha
marha@users.sourceforge.net
2011-09-27T06:37:02+00:00
urn:sha1:2233c44285f7e820f04abd07d6cf5eedbe32b8a3
Conflicts:
mesalib/src/mesa/main/version.c
xorg-server/include/globals.h
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/os/utils.c
libX11 pixman mesa xserver git update 27 sep 2011
2011-09-27T06:26:50+00:00
marha
marha@users.sourceforge.net
2011-09-27T06:26:50+00:00
urn:sha1:183b7373f9919eeb5eb408f38578e01717b2cc10
Merge remote-tracking branch 'origin/released'
2011-09-22T13:42:49+00:00
marha
marha@users.sourceforge.net
2011-09-22T13:42:49+00:00
urn:sha1:46d4f558531910ca1f3297da85b99334d6de2921
Conflicts:
xorg-server/Xext/dpms.c
xorg-server/Xext/saver.c
xorg-server/Xext/security.c
xorg-server/Xext/shape.c
xorg-server/Xext/sync.c
xorg-server/Xi/opendev.c
xorg-server/fb/wfbrename.h
xorg-server/glx/glxserver.h
xorg-server/hw/xwin/winwindowswm.c
xorg-server/mi/miarc.c
xorg-server/mi/miwideline.c
xorg-server/os/io.c
xorg-server/render/mipict.c
libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011
2011-09-22T13:20:09+00:00
marha
marha@users.sourceforge.net
2011-09-22T13:20:09+00:00
urn:sha1:c1e6c7428a8d2c1b60ffac7df7a3f56c300fa983
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