Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c | ||||
| * | mesa git update 30 May 2011 | marha | 2011-05-30 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 9 | -1422/+1803 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -2040/+2421 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-25 | 1 | -101/+19 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 25 May 2011 | marha | 2011-05-25 | 1 | -951/+869 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 3 | -6/+4 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 3 | -2879/+2877 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 9 | -2806/+10260 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 9 | -7631/+15085 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 3 | -22/+17 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 3 | -3207/+3202 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-13 | 2 | -1/+2 |
|\| | |||||
| * | mesa git update 13 May 2011 | marha | 2011-05-13 | 2 | -1/+2 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-12 | 1 | -3/+3 |
|\| | |||||
| * | libxcb mesa xcb-proto git update 12 May 2011 | marha | 2011-05-12 | 1 | -3/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-10 | 2 | -1/+2 |
|\| | |||||
| * | libfontenc pixman mesa git update 10 May 2011 | marha | 2011-05-10 | 2 | -1/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 6 | -5/+96 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 6 | -1463/+1554 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-04 | 2 | -109/+0 |
|\| | |||||
| * | libX11 mesa glproto git update 4 May 2011 | marha | 2011-05-04 | 2 | -109/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 3 | -1509/+1525 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 3 | -3932/+3948 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-02 | 4 | -29/+2 |
|\| | |||||
| * | mesa git update 1 May 2011 | marha | 2011-05-02 | 4 | -7717/+7690 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 15 | -38/+524 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 15 | -26352/+26838 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -0/+4 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -0/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 38 | -6841/+8197 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 38 | -14124/+15480 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 9 | -9/+256 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 9 | -3588/+3835 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 6 | -1369/+1373 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 6 | -2220/+2224 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 19 | -3500/+5207 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 19 | -34626/+36332 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-10 | 3 | -5/+7 |
|\| | |||||
| * | mesa git update | marha | 2011-04-10 | 3 | -1010/+1012 |
| | | |||||
* | | Solved compilation problem | marha | 2011-04-07 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-07 | 5 | -1269/+1241 |
|\| | |||||
| * | xserver pixman mesa git update 7 Apr 2011 | marha | 2011-04-07 | 5 | -860/+832 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 23 | -4794/+5212 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 23 | -39874/+40292 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 2 | -2013/+2046 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 2 | -4/+37 |
| | | |||||
* | | Solved crash due to latest merge | marha | 2011-04-01 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -3/+5 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -918/+920 |
| | |