Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 2 | -16/+27 |
|\ | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 2 | -16/+27 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 2 | -15/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-09-22 | 2 | -15/+11 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 3 | -1828/+1828 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-10 | 1 | -1413/+1417 |
|\| | | | | | | | | | Conflicts: mesalib/docs/GL3.txt | ||||
| * | mesa xserver git update 10 aug 2011 | marha | 2011-08-10 | 1 | -1413/+1417 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 7 | -2013/+2014 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -1975/+1976 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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-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-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 | 2 | -21/+10 |
|\| | |||||
| * | xserver git update 14/6/2010 | marha | 2010-06-14 | 2 | -21/+10 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 4 | -1521/+1521 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 4 | -1483/+1483 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-27 | 2 | -631/+631 |
|\| | |||||
| * | xserver git update 27/5/2010 | marha | 2010-05-27 | 2 | -631/+631 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 6 | -6140/+6139 |
| | | |||||
| * | Removed files not in the git repository | marha | 2010-04-28 | 5 | -959/+298 |
| | | |||||
| * | Updated to following packages: | marha | 2010-04-02 | 2 | -7/+9 |
| | | | | | | | | | | 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 | -4971/+4970 |
| | | |||||
* | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 5 | -959/+298 |
| | | |||||
* | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 2 | -7/+9 |
| | | |||||
* | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 1 | -0/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-02-15 | 1 | -0/+5 |
|\| | |||||
| * | Git update 15/2/2010 | marha | 2010-02-15 | 1 | -0/+5 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-02-14 | 5 | -300/+8 |
|\| | |||||
| * | Updated to xorg-server-1.7.99.901 | marha | 2010-02-14 | 5 | -300/+8 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-01-08 | 5 | -76/+87 |
|\| | |||||
| * | Git update 8 jan 2010 | marha | 2010-01-08 | 5 | -76/+85 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-01-05 | 10 | -252/+533 |
|\| | |||||
| * | Git update 4/1/2010 | marha | 2010-01-04 | 10 | -49/+330 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2009-12-20 | 6 | -300/+18 |
|\| | |||||
| * | Switched to xorg-server-1.7.99.2 | marha | 2009-12-20 | 6 | -300/+18 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2009-11-17 | 4 | -0/+298 |
|\| |