aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/devices.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-10-051-0/+12
|\ | | | | | | | | | | | | | | | | 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-0/+12
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-13/+20
|\| | | | | | | | | | | | | | | | | 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-13/+20
| |
* | Synchronised line endinge with release branchmarha2011-09-121-2630/+2630
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-291-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-9/+0
| |
* | merge ^/branches/released .marha2011-05-161-6/+4
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-6/+4
| |
* | Solved run-time exception in debug because value was larget then a s8marha2011-05-051-1/+1
| |
* | svn merge ^/branches/released .marha2011-04-271-11/+38
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-11/+38
| |
* | svn merge ^/branches/released .marha2011-03-281-28/+4
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-2630/+2606
| |
* | svn merge ^/branches/released .marha2011-03-151-0/+2
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-2628/+2630
| |
* | svn merge ^/branches/released .marha2011-03-041-55/+79
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-55/+79
| |
* | svn merge ^/branches/released .marha2011-02-281-6/+8
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-2602/+2604
| |
* | svn merge ^/branches/released .marha2010-12-121-6/+11
|\|
| * xserver git update 10/12/2010marha2010-12-101-6/+11
| |
* | svn merge "^/branches/released" .marha2010-11-151-18/+32
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-18/+32
| |
* | svn merge ^/branches/released .marha2010-10-141-1/+1
|\|
| * xserver git update 14/10/2010marha2010-10-141-1/+1
| |
* | svn merge ^/branches/released .marha2010-09-111-9/+14
|\|
| * xserver git update 11/9/2010marha2010-09-111-9/+14
| |
* | svn merge ^/branches/released .marha2010-08-181-6/+2
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-6/+2
| |
* | svn merge ^/branches/released .marha2010-07-021-1/+1
|\|
| * git update 2/7/2010marha2010-07-021-1/+1
| |
* | svn merge ^/branches/released .marha2010-06-161-1/+1
|\|
| * xserver and libxcb git update 11/6/2010marha2010-06-161-1/+1
| |
* | svn merge ^/branches/released .marha2010-06-111-20/+91
|\|
| * xserver git update 11/6/2010marha2010-06-111-20/+87
| |
* | svn merge ^/branches/released .marha2010-05-271-1/+1
|\|
| * xserver git update 27/5/2010marha2010-05-271-1/+1
| |
* | svn merge ^/branches/released .marha2010-05-261-1/+1
|\|
| * xserver git update 26/5/2010marha2010-05-261-1/+1
| |
* | svn merge ^/branches/released .marha2010-05-251-1/+2
|\|
| * xserver git update 25/5/2010marha2010-05-251-1/+2
| |
* | svn merge ^/branches/released .marha2010-05-221-4/+0
|\|
| * xserver git update 21/5/2010marha2010-05-211-4/+0
| |
| * xserver git update 15/5/2010marha2010-05-151-2518/+2518
| |
| * xserver git update 4/5/2010marha2010-05-041-14/+6
| |
* | Solved crash in closing downmarha2010-05-181-0/+4
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-2518/+2518
| |
* | svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-14/+6
|/
* Git update 24/2/2010"marha2010-02-241-8/+0
|