aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/events.c
Commit message (Collapse)AuthorAgeFilesLines
* Solved compile errormarha2011-06-151-1/+1
|
* Merge remote-tracking branch 'origin/released'marha2011-06-151-21/+86
|\ | | | | | | | | | | | | | | | | | | | | 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-21/+86
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-291-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011marha2011-05-291-3/+4
| |
* | merge ^/branches/released .marha2011-05-161-263/+401
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-263/+401
| |
* | 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-03-241-5/+5
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-241-5/+5
| |
* | svn merge ^/branches/released .marha2011-03-041-5819/+5858
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-69/+108
| |
* | svn merge ^/branches/released .marha2011-01-211-5825/+5819
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-5819/+5813
| |
* | svn merge ^/branches/released .marha2011-01-081-14/+1
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-14/+1
| |
* | svn merge ^/branches/released .marha2010-12-121-1/+1
|\|
| * xserver git update 10/12/2010marha2010-12-101-1/+1
| |
* | svn merge ^/branches/released .marha2010-10-141-43/+33
|\|
| * xserver git update 14/10/2010marha2010-10-141-43/+33
| |
* | svn merge ^/branches/released .marha2010-07-071-9/+3
|\|
| * git update 7/7/2010marha2010-07-071-9/+3
| |
* | svn merge ^/branches/released .marha2010-07-011-50/+2
|\|
| * git update 1/7/2010marha2010-07-011-50/+2
| |
* | svn merge ^/branches/released .marha2010-06-111-151/+139
|\|
| * xserver git update 11/6/2010marha2010-06-111-150/+138
| |
* | svn merge "^/branches/released" .marha2010-05-201-15/+11
|\|
| * xserver git update 20/5/2010marha2010-05-201-15/+11
| |
| * xserver git update 15/5/2010marha2010-05-151-5912/+5912
| |
| * xserver git update 4/5/2010marha2010-05-041-21/+20
| |
| * git update 27/4/2010marha2010-04-271-1/+0
| |
| * git update 16/4/2010marha2010-04-161-2/+6
| |
| * Updated to xorg-server-1.7.99.902marha2010-03-221-0/+36
| |
* | Solved crash in closing downmarha2010-05-181-1/+4
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-5915/+5915
| |
* | svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-21/+20
| |
* | svn merge -r549:HEAD "^/branches/released" .marha2010-04-271-1/+0
| |
* | svn merge -r534:HEAD ^/branches/released .marha2010-04-161-2/+6
| |
* | svn merge -c505 ^/branches/released .marha2010-03-221-0/+36
| |
* | svn merge "^/branches/released" .1.7.99.902marha2010-03-181-27/+1
|\| | | | | | | | | increased version number
| * Git update 16/3/2010marha2010-03-161-27/+1
| |
* | svn merge ^/branches/released .marha2010-03-161-5842/+5903
|\|
| * Git update 11/3/2010marha2010-03-111-5839/+5900
| |
* | svn merge ^/branches/released .marha2010-03-061-62/+1
|\|
| * Git update 6-3-2010marha2010-03-061-5900/+5839
| |
* | svn merge ^/branches/released .marha2010-02-251-54/+38
|\|
| * Git update 24/2/2010"marha2010-02-241-54/+38
| |