aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/src
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-123-4165/+4165
|
* Merge remote-tracking branch 'origin/released'marha2011-08-011-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv
| * mesa xserver pixman xkeyboard-config git update 1 aug 2011marha2011-08-011-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-045-494/+501
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-045-494/+501
| |
* | merge ^/branches/released .marha2011-05-161-18/+5
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-18/+5
| |
* | svn merge ^/branches/released .marha2011-04-271-2/+2
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-2/+2
| |
* | svn merge ^/branches/released .marha2011-03-283-97/+2
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-283-4237/+4142
| |
* | svn merge ^/branches/released .marha2010-12-011-6/+0
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-011-6/+0
| |
* | svn merge "^/branches/released" .marha2010-11-151-34/+5
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-34/+5
| |
* | svn merge ^/branches/released .marha2010-10-051-1/+1
|\|
* | svn merge ^/branches/released .marha2010-09-111-6/+3
|\|
| * xserver git update 11/9/2010marha2010-09-111-6/+3
| |
* | svn merge ^/branches/released .marha2010-06-141-6/+6
|\|
| * xserver git update 14/6/2010marha2010-06-141-6/+6
| |
* | svn merge ^/branches/released .marha2010-06-113-726/+731
|\|
| * xserver git update 11/6/2010marha2010-06-113-726/+731
| |
| * xserver git update 15/5/2010marha2010-05-156-6040/+6040
| |
| * Removed files not in the git repositorymarha2010-04-281-743/+0
| |
| * git update 22/4/2010marha2010-04-221-2/+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-166-2413/+2413
| |
* | svn merge -r554:HEAD "^/branches/released" .marha2010-04-281-743/+0
| |
* | svn merge -r541:HEAD "^/branches/released" .marha2010-04-221-4/+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/released .marha2010-02-251-1/+1
|\|
| * Git update 24/2/2010"marha2010-02-241-1/+1
| |
* | svn merge ^/branches/releasedmarha2010-02-141-10/+9
|\|
| * Updated to xorg-server-1.7.99.901marha2010-02-141-10/+9
| |
* | svn merge ^/branches/releasedmarha2010-01-0810-1858/+1409
|\|
| * Git update 8 jan 2010marha2010-01-0810-647/+205
| |
* | svn merge ^/branches/releasedmarha2010-01-053-217/+207
|\|
| * Git update 4/1/2010marha2010-01-043-217/+207
| |
* | svn merge ^/branches/releasedmarha2009-12-201-1/+13
|\|
| * Switched to xorg-server-1.7.99.2marha2009-12-201-1/+13
| |
* | svn merge ^/branches/releasedmarha2009-10-212-16/+9
|\|
| * Updated to xorg-server-1.7.99.1marha2009-10-212-16/+9
| |
* | 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/released .marha2009-10-051-0/+6
|\|
| * Updated tomarha2009-10-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0
* | synchronised makefile and Makefile.am1.1.1marha2009-09-211-4/+3
| |
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-156-3038/+2415
|\|