Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 2 | -1/+22 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+22 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 1 | -1/+1 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 4 | -196/+166 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 4 | -42/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 3 | -775/+759 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 3 | -775/+759 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -1/+8 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -2183/+2190 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 3 | -10/+27 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 3 | -1506/+1523 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 2 | -104/+6 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 2 | -1511/+1413 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 2 | -3/+3 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 2 | -1380/+1380 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 2 | -2171/+2171 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 2 | -2171/+2171 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 3 | -4/+6 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 3 | -1381/+1383 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 3 | -904/+950 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 3 | -3003/+3049 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-25 | 3 | -218/+214 |
|\| | |||||
| * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 3 | -2767/+2763 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 5 | -1586/+1629 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 5 | -1586/+1629 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-03 | 3 | -1455/+1447 |
|\| | |||||
| * | libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 | marha | 2011-02-03 | 3 | -1455/+1447 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 4 | -5/+6 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 4 | -5/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-23 | 13 | -8243/+7997 |
|\| | |||||
| * | xserver libX11 libXdmcp pixman git update 22-12-2010 | marha | 2010-12-22 | 13 | -8243/+7997 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-16 | 2 | -2287/+2294 |
|\| | |||||
| * | xserver libXdmcp git update 16-12-2010 | marha | 2010-12-16 | 2 | -2287/+2294 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 10 | -58/+39 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 10 | -58/+39 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 12 | -489/+564 |
|\| | |||||
| * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 8 | -17/+32 |
| | | |||||
| * | libXext xserver pixman git update 6-12-2010 | marha | 2010-12-06 | 4 | -472/+532 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 4 | -11/+17 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 4 | -11/+17 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-30 | 1 | -1/+1 |
|\| | |||||
| * | libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010 | marha | 2010-11-26 | 1 | -1/+1 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 15 | -694/+620 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver git update 15/11/2010 | marha | 2010-11-15 | 1 | -1/+1 |
| | | |||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 15 | -694/+620 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-20 | 1 | -0/+4 |
|\| | |||||
| * | xserver git update 20/10/2010 | marha | 2010-10-20 | 1 | -0/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-19 | 4 | -69/+86 |
|\| | |||||
| * | xserver update 19/10/2010 | marha | 2010-10-19 | 4 | -69/+86 |
| | |