Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 2 | -17/+6 |
|\ | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-12-16 | 2 | -17/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 1 | -6/+0 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 1 | -6/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 1 | -3/+1 |
|\| | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-11-25 | 1 | -3/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -60/+79 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -60/+79 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -11/+1 |
|\| | | | | | | | | | | | | | | | | | 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 ↵ | marha | 2011-10-05 | 1 | -11/+1 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 3 | -4165/+4165 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-01 | 1 | -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 2011 | marha | 2011-08-01 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 5 | -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 2011 | marha | 2011-07-04 | 5 | -494/+501 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -18/+5 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -18/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -2/+2 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 3 | -97/+2 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 3 | -4237/+4142 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 1 | -6/+0 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 1 | -6/+0 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 1 | -34/+5 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 1 | -34/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-05 | 1 | -1/+1 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -6/+3 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -6/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-14 | 1 | -6/+6 |
|\| | |||||
| * | xserver git update 14/6/2010 | marha | 2010-06-14 | 1 | -6/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 3 | -726/+731 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 3 | -726/+731 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 6 | -6040/+6040 |
| | | |||||
| * | Removed files not in the git repository | marha | 2010-04-28 | 1 | -743/+0 |
| | | |||||
| * | git update 22/4/2010 | marha | 2010-04-22 | 1 | -2/+0 |
| | | |||||
| * | Updated to following packages: | marha | 2010-04-02 | 1 | -0/+2 |
| | | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0 | ||||
| * | Updated to xorg-server-1.7.99.902 | marha | 2010-03-22 | 1 | -0/+3 |
| | | |||||
* | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 6 | -2413/+2413 |
| | | |||||
* | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 1 | -743/+0 |
| | | |||||
* | | svn merge -r541:HEAD "^/branches/released" . | marha | 2010-04-22 | 1 | -4/+0 |
| | | |||||
* | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 1 | -0/+2 |
| | | |||||
* | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 1 | -0/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-02-25 | 1 | -1/+1 |
|\| | |||||
| * | Git update 24/2/2010" | marha | 2010-02-24 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-02-14 | 1 | -10/+9 |
|\| | |||||
| * | Updated to xorg-server-1.7.99.901 | marha | 2010-02-14 | 1 | -10/+9 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-01-08 | 10 | -1858/+1409 |
|\| | |||||
| * | Git update 8 jan 2010 | marha | 2010-01-08 | 10 | -647/+205 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-01-05 | 3 | -217/+207 |
|\| | |||||
| * | Git update 4/1/2010 | marha | 2010-01-04 | 3 | -217/+207 |
| | |