Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-01 | 2 | -2496/+2498 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po | ||||
| * | mesa pixman xkeyboard-config git update 1 Jun 2011 | marha | 2011-06-01 | 12 | -3897/+3955 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 10 | -1401/+1457 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -1401/+1457 |
| |/ | |||||
* | | Added gitignore files | marha | 2011-05-30 | 3 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 15 | -5602/+5602 |
|\| | |||||
| * | Synchronised files. The revision number was removed | marha | 2011-05-30 | 15 | -5602/+5602 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 18 | -2239/+2630 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 18 | -2857/+3248 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-25 | 2 | -1006/+570 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 25 May 2011 | marha | 2011-05-25 | 2 | -2643/+2207 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 4 | -6/+9 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 4 | -3117/+3120 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 24 | -2829/+10724 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 25 | -16963/+24855 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 4 | -23/+23 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 4 | -3208/+3208 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 10 | -190/+283 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 10 | -1708/+1801 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-13 | 3 | -354/+355 |
|\| | |||||
| * | mesa git update 13 May 2011 | marha | 2011-05-13 | 3 | -2/+3 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-12 | 2 | -3/+9 |
|\| | |||||
| * | libxcb mesa xcb-proto git update 12 May 2011 | marha | 2011-05-12 | 2 | -3/+9 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-10 | 7 | -17/+41 |
|\| | |||||
| * | libfontenc pixman mesa git update 10 May 2011 | marha | 2011-05-10 | 7 | -17/+41 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 14 | -14/+127 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 14 | -2806/+2919 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-06 | 2 | -4/+14 |
|\| | |||||
| * | glproto mesa git update 6 May 2011 | marha | 2011-05-06 | 2 | -12/+22 |
| | | |||||
* | | Bumped version to 1.10.11.10.1 | marha | 2011-05-05 | 4 | -4/+5 |
|\| | | | | | | | | | | | Added release note svn merge ^/branches/released . | ||||
| * | libX11 libxcb mesa git update 5 May 2011 | marha | 2011-05-05 | 4 | -627/+628 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-04 | 3 | -110/+1 |
|\| | |||||
| * | libX11 mesa glproto git update 4 May 2011 | marha | 2011-05-04 | 3 | -110/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 19 | -1702/+1917 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 19 | -4125/+4340 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-02 | 9 | -48/+29 |
|\| | |||||
| * | mesa git update 1 May 2011 | marha | 2011-05-02 | 9 | -9861/+9842 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 156 | -497/+35428 |
|\| | |||||
| * | Added extra needed files | marha | 2011-04-30 | 133 | -0/+34328 |
| | | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 25 | -34749/+35352 |
| | | |||||
* | | Synchronised files | marha | 2011-04-29 | 1 | -4/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-29 | 1 | -0/+7 |
|\| | |||||
| * | xserver mesa git update 28 Apr 2011 | marha | 2011-04-29 | 1 | -1089/+1096 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 8 | -9/+42 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 8 | -798/+831 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 104 | -25669/+26420 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 110 | -34840/+30715 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 17 | -1913/+2458 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 17 | -5571/+6116 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 13 | -2169/+2208 |
|\| |