aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xfixes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-034-1416/+1852
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-034-1414/+1850
| |
* | merge ^/branches/released .marha2011-05-161-6/+6
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-294/+294
| |
* | svn merge ^/branches/released .marha2011-04-051-2/+0
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-922/+920
| |
* | svn merge ^/branches/released .marha2011-02-201-1/+1
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1/+1
| |
* | svn merge ^/branches/released .marha2010-12-123-3/+3
|\|
| * xserver git update 10/12/2010marha2010-12-103-3/+3
| |
* | svn merge ^/branches/released .marha2010-12-013-272/+393
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-013-272/+393
| |
* | svn merge ^/branches/released .marha2010-06-115-46/+47
|\|
| * xserver git update 11/6/2010marha2010-06-115-46/+47
| |
* | svn merge ^/branches/released .marha2010-05-251-38/+1
|\|
| * xserver git update 25/5/2010marha2010-05-251-38/+1
| |
* | svn merge "^/branches/released" .marha2010-05-205-73/+64
|\|
| * xserver git update 20/5/2010marha2010-05-205-73/+64
| |
| * xserver git update 15/5/2010marha2010-05-155-1772/+1759
| |
| * xserver git update 9/5/2010marha2010-05-091-857/+855
| |
| * xserver git update 4/5/2010marha2010-05-041-11/+12
| |
| * Removed files not in the git repositorymarha2010-04-281-750/+0
| |
| * git update 22/4/2010marha2010-04-221-10/+0
| |
| * Updated to following packages:marha2010-04-021-0/+2
| | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0
| * Updated to xorg-server-1.7.99.902marha2010-03-221-0/+3
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-165-690/+677
| |
* | svn merge -r577:HEAD ^/branches/released .marha2010-05-091-857/+855
| |
* | svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-11/+12
| |
* | svn merge -r554:HEAD "^/branches/released" .marha2010-04-281-750/+0
| |
* | svn merge -r541:HEAD "^/branches/released" .marha2010-04-221-10/+0
| |
* | svn merge -r522:HEAD ^/branches/released .marha2010-04-021-0/+2
| |
* | svn merge -c505 ^/branches/released .marha2010-03-221-0/+3
| |
* | svn merge ^/branches/releasedmarha2010-02-141-1/+5
|\|
| * Updated to xorg-server-1.7.99.901marha2010-02-141-1/+5
| |
* | svn merge ^/branches/releasedmarha2009-12-204-9/+27
|\|
| * Switched to xorg-server-1.7.99.2marha2009-12-204-9/+27
| |
* | svn merge ^/branches/releasedmarha2009-12-173-63/+45
|\|
| * Git update 17/12/2009marha2009-12-173-63/+45
| |
* | svn merge ^/branches/releasedmarha2009-10-211-11/+4
|\|
| * Updated to xorg-server-1.7.99.1marha2009-10-211-11/+4
| |
* | svn merge ^/branches/released .marha2009-10-121-1/+2
|\|
| * Updated to:marha2009-10-121-1/+2
| | | | | | | | | | | | | | font-util-1.1.1 xorg-server-1.7.0.901
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/releasedmarha2009-09-242-1118/+1114
|\|
| * Update following packages:marha2009-09-242-12/+8
| | | | | | | | | | | | | | | | - xproto-7.0.16 - libXdmcp-1.0.3 - bdftopcf-1.0.2 - xorg-server-1.6.99.902
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-151-11/+30
|\|
| * Checked in xorg-server-1.6.99.901marha2009-09-151-11/+30
| |
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-098-120/+247
|\|
| * Switched to xorg-server-1.6.99.900.tar.gzmarha2009-09-068-120/+247
| |
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-023-27/+56
|\|
| * Switched to xorg-server-1.6.3.901.tar.gzmarha2009-09-023-27/+56
| |