Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 22 | -5330/+5340 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 22 | -5292/+5302 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-06 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c | ||||
| * | mesa xserver xkb git update 6 Jun 2011 | marha | 2011-06-06 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 2 | -3/+29 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in | ||||
| * | libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011 | marha | 2011-05-29 | 2 | -1157/+1183 |
| | | |||||
* | | 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 | 2011-01-19 | 3 | -20/+8 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 3 | -20/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 1 | -1/+1 |
|\| | |||||
| * | libXext xserver pixman git update 6-12-2010 | marha | 2010-12-06 | 1 | -1/+1 |
| | | |||||
* | | 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 | 2 | -39/+7 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 2 | -39/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-04 | 1 | -4/+11 |
|\| | |||||
| * | xserver git update 4/11/2010 | marha | 2010-11-04 | 1 | -4/+11 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-05 | 1 | -1/+1 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-30 | 1 | -76/+59 |
|\| | |||||
| * | xserver libX11 xkeyboard-config git update 30/9/2010 | marha | 2010-09-30 | 1 | -76/+59 |
| | | |||||
* | | 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-07-07 | 1 | -7/+1 |
|\| | |||||
| * | git update 7/7/2010 | marha | 2010-07-07 | 1 | -7/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-01 | 2 | -6/+12 |
|\| | |||||
| * | git update 1/7/2010 | marha | 2010-07-01 | 2 | -6/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-16 | 1 | -62/+45 |
|\| | |||||
| * | xserver and libxcb git update 11/6/2010 | marha | 2010-06-16 | 1 | -62/+45 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-14 | 3 | -27/+16 |
|\| | |||||
| * | xserver git update 14/6/2010 | marha | 2010-06-14 | 3 | -27/+16 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 8 | -2249/+2253 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 8 | -2211/+2215 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-27 | 3 | -633/+633 |
|\| | |||||
| * | xserver git update 27/5/2010 | marha | 2010-05-27 | 3 | -633/+633 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-26 | 1 | -2/+2 |
|\| | |||||
| * | xserver git update 26/5/2010 | marha | 2010-05-26 | 1 | -2/+2 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 18 | -16006/+16005 |
| | | |||||
| * | Removed files not in the git repository | marha | 2010-04-28 | 12 | -4730/+383 |
| | | |||||
| * | git update 22/4/2010 | marha | 2010-04-22 | 1 | -2/+0 |
| | | |||||
| * | Updated to following packages: | marha | 2010-04-02 | 11 | -14/+26 |
| | | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0 | ||||
| * | Updated to xorg-server-1.7.99.902 | marha | 2010-03-22 | 6 | -0/+18 |
| | | |||||
* | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 18 | -11210/+11209 |
| | | |||||
* | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 12 | -4730/+383 |
| | | |||||
* | | svn merge -r541:HEAD "^/branches/released" . | marha | 2010-04-22 | 1 | -4/+0 |
| | | |||||
* | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 11 | -14/+26 |
| | |