aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-09-2250-4510/+4291
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-2250-4513/+4294
| |
* | Synchronised line endinge with release branchmarha2011-09-1214-6402/+6402
| |
* | 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-163-227/+233
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-163-104/+110
| |
* | svn merge ^/branches/released .marha2011-04-281-2/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-2/+0
| |
* | svn merge ^/branches/released .marha2011-04-274-12/+19
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-274-315/+322
| |
* | svn merge ^/branches/released .marha2011-04-055-10/+20
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-055-371/+381
| |
* | svn merge ^/branches/released .marha2011-03-284-413/+240
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-284-563/+390
| |
* | svn merge ^/branches/released .marha2011-03-152-4/+4
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-152-309/+309
| |
* | svn merge ^/branches/released .marha2011-03-102-1310/+1310
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-102-85/+85
| |
* | svn merge ^/branches/released .marha2011-03-046-2402/+2399
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-046-1545/+1542
| |
* | svn merge ^/branches/released .marha2011-02-202-2/+2
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-202-2/+2
| |
* | svn merge ^/branches/released .marha2011-01-213-3493/+3497
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-213-3484/+3488
| |
* | svn merge ^/branches/released .marha2011-01-083-164/+175
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-083-164/+175
| |
* | 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-1510-506/+443
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-1410-503/+443
| |
* | svn merge ^/branches/released .marha2010-11-041-2/+2
|\|
| * xserver git update 4/11/2010marha2010-11-041-2/+2
| |
* | svn merge ^/branches/released .marha2010-09-111-2/+1
|\|
| * xserver git update 11/9/2010marha2010-09-111-2/+1
| |
* | 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-1113-629/+624
|\|
| * xserver git update 11/6/2010marha2010-06-1113-628/+623
| |
* | 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-246/+246
|\|
| * xserver git update 26/5/2010marha2010-05-261-246/+246
| |
* | svn merge "^/branches/released" .marha2010-05-203-116/+116
|\|
| * xserver git update 20/5/2010marha2010-05-203-116/+116
| |