vcxsrv/xorg-server/hw/xwin/winmouse.c, 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-05-30T09:42:37+00:00
Solved merge problem
2011-05-30T09:42:37+00:00
marha
marha@users.sourceforge.net
2011-05-30T09:42:37+00:00
urn:sha1:5719b20f6566d6df13010c106630e8448384d688
Merge remote-tracking branch 'origin/released'
2011-05-29T13:44:00+00:00
marha
marha@users.sourceforge.net
2011-05-29T13:44:00+00:00
urn:sha1:75b5635aa9e9791d10e3f63538e75237303ee6da
Conflicts:
libX11/specs/libX11/CH08.xml
mesalib/src/mesa/main/dlist.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/queryobj.c
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_readpixels.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mkfontscale/list.h
pixman/pixman/Makefile.win32
xorg-server/dix/devices.c
xorg-server/dix/events.c
xorg-server/dix/inpututils.c
xorg-server/fb/fbbltone.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/xfree86/common/xf86Module.h
xorg-server/hw/xfree86/common/xf86Xinput.c
xorg-server/hw/xfree86/man/xorg.conf.man
xorg-server/hw/xwin/winkeybd.c
xorg-server/hw/xwin/winmouse.c
xorg-server/include/input.h
xorg-server/include/inputstr.h
xorg-server/mi/mieq.c
xorg-server/randr/rrscreen.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/base.xml.in
libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011
2011-05-29T13:02:10+00:00
marha
marha@users.sourceforge.net
2011-05-29T13:02:10+00:00
urn:sha1:1ccf18dc09e288ddf937aa890b50c8d0a9df4319
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-06T21:03:59+00:00
marha
marha@users.sourceforge.net
2011-04-06T21:03:59+00:00
urn:sha1:e2b908c356746281aba48128da7dc15a28f5a773
xserver libX11 libxcb mesa git update 6 Apr 2011
2011-04-06T20:33:32+00:00
marha
marha@users.sourceforge.net
2011-04-06T20:33:32+00:00
urn:sha1:704e01fc69ebf6302aa1876906805147248abdaa
svn merge ^/branches/released .
2011-03-15T22:49:12+00:00
marha
marha@users.sourceforge.net
2011-03-15T22:49:12+00:00
urn:sha1:8285341e69cd721c6871b553e45437c767200545
svn merge "^/branches/released" .
2010-11-15T16:51:22+00:00
marha
marha@users.sourceforge.net
2010-11-15T16:51:22+00:00
urn:sha1:f586b49ae23c573681b939ca44b3f418c83c84b2
Solved mouse motion bug in new version of dix/getevents.c
xserver git update 15/11/2010
2010-11-15T09:43:51+00:00
marha
marha@users.sourceforge.net
2010-11-15T09:43:51+00:00
urn:sha1:3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626