aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/exevents.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-161-73/+74
|\ | | | | | | | | | | | | | | | | 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 2011marha2011-12-161-73/+74
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-121-39/+49
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-121-39/+49
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-051-7/+28
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-051-7/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-171-4/+4
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-4/+16
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-4/+16
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-8/+56
|\| | | | | | | | | | | | | | | | | 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-8/+56
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-6/+0
|\| | | | | | | | | | | | | | | | | 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-6/+0
| |
* | Synchronised line endinge with release branchmarha2011-09-121-2144/+2144
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-151-28/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
| * mesa xserver git update 15 June 2011marha2011-06-151-27/+1
| |
* | __func__ is not defined in VCmarha2011-06-081-1/+1
| | | | | | | | Replace it by the __FUNCTION__ macro
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| |
* | merge ^/branches/released .marha2011-05-161-99/+106
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-99/+106
| |
* | svn merge ^/branches/released .marha2011-04-271-7/+4
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-7/+4
| |
* | svn merge ^/branches/released .marha2011-04-051-2/+6
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-2/+6
| |
* | svn merge ^/branches/released .marha2011-03-281-24/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-24/+0
| |
* | svn merge ^/branches/released .marha2011-03-041-2186/+2187
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-9/+10
| |
* | svn merge ^/branches/released .marha2011-01-211-2185/+2186
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-2176/+2177
| |
* | svn merge ^/branches/released .marha2010-12-081-2/+4
|\|
| * xserver pixman git update 7-12-2010marha2010-12-071-2/+4
| |
* | svn merge "^/branches/released" .marha2010-11-151-12/+9
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-12/+9
| |
* | svn merge ^/branches/released .marha2010-08-181-0/+6
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-0/+6
| |
* | svn merge ^/branches/released .marha2010-07-071-15/+12
|\|
| * git update 7/7/2010marha2010-07-071-15/+12
| |
* | svn merge ^/branches/released .marha2010-06-111-12/+8
|\|
| * xserver git update 11/6/2010marha2010-06-111-11/+7
| |
* | svn merge "^/branches/released" .marha2010-05-201-2/+2
|\|
| * xserver git update 20/5/2010marha2010-05-201-2/+2
| |
| * xserver git update 15/5/2010marha2010-05-151-2178/+2178
| |
| * xserver git update 4/5/2010marha2010-05-041-39/+24
| |
* | Solved crash in closing downmarha2010-05-181-1/+4
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-28/+28
| |
* | svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-39/+24
| |
* | svn merge "^/branches/released" .1.7.99.902marha2010-03-181-1/+1
|\| | | | | | | | | increased version number