Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -1/+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 | 1 | -1/+11 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 1 | -8/+36 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 1 | -8/+36 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -0/+16 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -0/+16 |
| | | |||||
* | | 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 | 1 | -0/+24 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 1 | -0/+24 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-13 | 1 | -12/+72 |
|\| | |||||
| * | xkeyboard-config libxcb libX11 git update 13 April 2011 | marha | 2011-04-13 | 1 | -12/+72 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 1 | -9/+25 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 1 | -9/+25 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 1 | -0/+16 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 1 | -0/+16 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 1 | -9/+9 |
|\| | |||||
| * | xkeyboard-config mesa git update 2 Mar 2011 | marha | 2011-03-02 | 1 | -102/+102 |
|/ | |||||
* | libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010 | marha | 2010-08-18 | 1 | -0/+16 |
| | |||||
* | Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵ | marha | 2010-07-13 | 1 | -0/+86 |
repository) |