vcxsrv/xorg-server/Xi, branch 1.13.0.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.13.0.0
2012-10-08T07:06:44+00:00
Merge remote-tracking branch 'origin/released'
2012-10-08T07:06:44+00:00
marha
marha@users.sourceforge.net
2012-10-08T07:06:44+00:00
urn:sha1:9b15e1cfe4c6ca9862c2865c4adbc21a758e9734
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
2012-10-08T06:09:46+00:00
marha
marha@users.sourceforge.net
2012-10-08T06:09:46+00:00
urn:sha1:de8397bc3d010bba24ec0c4d2e6249a769a86fc7
xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312
libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d
mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835
xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175
pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
Merge remote-tracking branch 'origin/released'
2012-08-07T06:28:39+00:00
marha
marha@users.sourceforge.net
2012-08-07T06:28:39+00:00
urn:sha1:666141b21e89c617ca466af62ebcb56dc4f5450c
Conflicts:
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winmultiwindowicons.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winwin32rootlesswindow.c
xorg-server/hw/xwin/winwindow.h
mesa xserver xkeyboard-config git update 7 Aug 2012
2012-08-07T05:51:02+00:00
marha
marha@users.sourceforge.net
2012-08-07T05:51:02+00:00
urn:sha1:f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0
Merge remote-tracking branch 'origin/released'
2012-07-11T09:55:48+00:00
marha
marha@users.sourceforge.net
2012-07-11T09:55:48+00:00
urn:sha1:6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
fontconfig mesa xserver git update 10 Jul 2012
2012-07-10T12:56:29+00:00
marha
marha@users.sourceforge.net
2012-07-10T12:56:29+00:00
urn:sha1:d137057fd13e83ec15ab416c7fe774741da06047
Merge remote-tracking branch 'origin/released'
2012-07-06T07:31:01+00:00
marha
marha@users.sourceforge.net
2012-07-06T07:31:01+00:00
urn:sha1:405ae9defaaa03d4d305b6264a744107c3dd460d
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/src/kinput.c
randrproto fontconfig mesa xserver git update 6 Jul 2012
2012-07-06T07:13:41+00:00
marha
marha@users.sourceforge.net
2012-07-06T07:12:35+00:00
urn:sha1:336bad93d146931c160d8517edfdf0bee49ad9f7
Merge remote-tracking branch 'origin/released'
2012-06-15T06:55:18+00:00
marha
marha@users.sourceforge.net
2012-06-15T06:55:18+00:00
urn:sha1:d6f64084b9bc07d0bdd527f9354f2d1d962ed16d
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
fontconfig mesa pixman xserver git update 15 juni 2012
2012-06-15T06:28:24+00:00
marha
marha@users.sourceforge.net
2012-06-15T06:28:24+00:00
urn:sha1:7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb