vcxsrv/xorg-server/os, branch 1.11.4.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.4.0
2012-01-13T16:04:47+00:00
Merge remote-tracking branch 'origin/released'
2012-01-13T16:04:47+00:00
marha
marha@users.sourceforge.net
2012-01-13T16:04:47+00:00
urn:sha1:e2e1bdced7e09e39fed613dae1f2f3096cb18118
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_out.c
libxcb/src/xcb_util.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/include/misc.h
xorg-server/os/connection.c
libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012
2012-01-13T15:54:57+00:00
marha
marha@users.sourceforge.net
2012-01-13T15:54:57+00:00
urn:sha1:5cfbe97cd797d8f78ece208bb5114704b83d8aab
Merge remote-tracking branch 'origin/released'
2012-01-11T07:57:05+00:00
marha
marha@users.sourceforge.net
2012-01-11T07:55:02+00:00
urn:sha1:a73c45b7c72c6e426e1c75dd939f5481227b6979
Conflicts:
pixman/pixman/pixman-trap.c
xorg-server/Xext/xace.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winengine.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
mesa pixman xserver git update 11 jan 2012
2012-01-11T07:18:52+00:00
marha
marha@users.sourceforge.net
2012-01-11T07:18:52+00:00
urn:sha1:38e661c7d82fa0b34fbe9b3f3261295787bb6427
Merge remote-tracking branch 'origin/released'
2011-12-28T23:17:36+00:00
marha
marha@users.sourceforge.net
2011-12-28T23:17:36+00:00
urn:sha1:d515b895dc5151d102f33b577cafbf63473bbafa
xserver libX11 mesa xkeyboard-config git update 28 dec 2011
2011-12-28T22:31:50+00:00
marha
marha@users.sourceforge.net
2011-12-28T22:31:50+00:00
urn:sha1:9715b7fab0757c86e1bb151f3dce0b324bcff692
Merge remote-tracking branch 'origin/released'
2011-12-16T19:46:08+00:00
marha
marha@users.sourceforge.net
2011-12-16T19:49:54+00:00
urn:sha1:1ae4005bfe3690b34ec40e33918b3e24468d47e1
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
xserver git update 16 dec 2011
2011-12-16T19:45:15+00:00
marha
marha@users.sourceforge.net
2011-12-16T19:45:15+00:00
urn:sha1:47913e82955ec8e2b1ba4d4b145497dede9163b5
Include dix-config.h to remove warning
2011-12-08T09:45:43+00:00
marha
marha@users.sourceforge.net
2011-12-08T09:45:43+00:00
urn:sha1:2331d6e4ac699e775ccee07a8a461cae0a98033a
Synchronised dix-config.h and dix-config.h.in
2011-12-08T09:38:59+00:00
marha
marha@users.sourceforge.net
2011-12-08T09:38:59+00:00
urn:sha1:110b0c9eb192808d1f7d39b71258be047b2bcc7d