Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 2 | -11/+11 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -11/+11 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 2 | -14/+42 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 2 | -14/+42 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 2 | -0/+113 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 2 | -0/+113 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 1 | -0/+7 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 1 | -0/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -4/+4 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -4/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -10/+10 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -10/+10 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 2 | -14/+24 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 2 | -14/+24 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -50/+49 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -1/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-13 | 2 | -60/+141 |
|\| | |||||
| * | xkeyboard-config libxcb libX11 git update 13 April 2011 | marha | 2011-04-13 | 2 | -60/+141 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-07 | 1 | -1/+1 |
|\| | |||||
| * | xserver pixman mesa git update 7 Apr 2011 | marha | 2011-04-07 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 1 | -139/+63 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 1 | -139/+63 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -570/+658 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -570/+658 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 2 | -11/+27 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 2 | -6218/+6234 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-13 | 2 | -3/+10 |
|\| | |||||
| * | xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011 | marha | 2011-03-13 | 2 | -6205/+6212 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-08 | 1 | -0/+7 |
|\| | |||||
| * | xkeyboard-config mesa git update 8 Mar 2011 | marha | 2011-03-08 | 1 | -6195/+6202 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-05 | 1 | -0/+40 |
|\| | |||||
| * | xserver libxcb mesa git update 5 Mar 2011 | marha | 2011-03-05 | 1 | -6155/+6195 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 7 | -401/+315 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 5 | -99/+57 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 4 | -1020/+1373 |
|\| | |||||
| * | xkeyboard-config mesa git update 2 Mar 2011 | marha | 2011-03-02 | 4 | -803/+1156 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 2 | -2/+9 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 2 | -144/+151 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-25 | 1 | -1/+0 |
|\| | |||||
| * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 1 | -42/+41 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-23 | 1 | -11/+11 |
|\| | |||||
| * | xserver pixman mesa git update 23 Feb 2011 | marha | 2011-02-23 | 1 | -5766/+5766 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-21 | 4 | -74/+71 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 Feb 2011 | marha | 2011-02-21 | 2 | -54/+52 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 3 | -12/+24 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 3 | -12/+24 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-14 | 2 | -0/+7 |
|\| | |||||
| * | xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011 | marha | 2011-02-12 | 2 | -0/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-12 | 1 | -1/+1 |
|\| | |||||
| * | xkeyboard-config libX11 mesalib git update 12 jan 2011 | marha | 2011-01-12 | 1 | -1/+1 |
| | |