aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/getevents.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-171-1/+1
|\ | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-041-38/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-041-38/+104
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-14/+28
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-14/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-191-59/+109
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-191-59/+109
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-246/+372
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-246/+372
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-23/+4
|\| | | | | | | | | | | | | | | | | 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 2011marha2011-09-271-23/+4
| |
* | Synchronised line endinge with release branchmarha2011-09-121-1397/+1397
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-041-7/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-041-7/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-14/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011marha2011-06-081-15/+28
| |
* | merge ^/branches/released .marha2011-05-161-77/+129
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-78/+126
| |
* | svn merge ^/branches/released .marha2011-04-281-1/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+0
| |
* | svn merge ^/branches/released .marha2011-04-271-17/+4
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-17/+4
| |
* | svn merge ^/branches/released .marha2011-04-071-0/+4
|\|
| * xserver pixman mesa git update 7 Apr 2011marha2011-04-071-1314/+1318
| |
* | svn merge ^/branches/released .marha2011-03-151-24/+14
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-1324/+1314
| |
* | svn merge ^/branches/released .marha2011-03-041-1338/+1339
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-7/+8
| |
* | svn merge ^/branches/released .marha2010-12-161-1324/+1338
|\|
| * xserver libXdmcp git update 16-12-2010marha2010-12-161-1309/+1323
| |
* | svn merge ^/branches/released .marha2010-12-011-6/+6
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-011-6/+6
| |
* | svn merge ^/branches/released .marha2010-11-301-13/+26
|\|
| * libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010marha2010-11-261-14/+27
| |
* | svn merge "^/branches/released" .marha2010-11-151-137/+175
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-137/+175
| |
* | svn merge ^/branches/released .marha2010-10-191-17/+7
|\|
| * xserver update 19/10/2010marha2010-10-191-17/+7
| |
* | svn merge ^/branches/released .marha2010-08-201-5/+16
|\|
| * xserver git update 19/8/2010marha2010-08-191-5/+16
| |
* | svn merge ^/branches/released .marha2010-08-181-5/+5
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-5/+5
| |
* | svn merge ^/branches/released .marha2010-07-071-9/+40
|\|
| * git update 7/7/2010marha2010-07-071-9/+40
| |
* | svn merge ^/branches/released .marha2010-06-111-4/+27
|\|
| * xserver git update 11/6/2010marha2010-06-111-4/+22
| |
| * xserver git update 15/5/2010marha2010-05-151-1208/+1208
| |
* | Solved possible crash due to null ptrmarha2010-05-251-1/+1
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-9/+9
| |