aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-02-221-12/+18
|\
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-221-12/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-132-121/+120
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-132-121/+120
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-112-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-112-11/+11
| |
* | Solved compile errormarha2011-12-231-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-237-24/+1121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-237-24/+1121
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-169-87/+88
|\| | | | | | | | | | | | | | | | | 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-169-87/+88
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-127-90/+146
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-127-90/+146
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-081-2/+2
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-081-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-052-23/+48
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-052-23/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-252-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-252-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-172-5/+5
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-172-5/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-272-8/+19
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-262-8/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-055-11/+134
|\| | | | | | | | | | | | | | | | | 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-055-11/+134
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-272-9/+10
|\| | | | | | | | | | | | | | | | | 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-272-9/+10
| |
* | 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
|\|