Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleaned output | marha | 2011-06-03 | 1 | -3/+7 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 2 | -1/+13 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru | ||||
| * | xserver xkeyboard-config mesa git update 3 Jun 2011 | marha | 2011-06-03 | 2 | -1/+13 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 1 | -0/+5 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 1 | -238/+243 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 1 | -4/+14 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 1 | -4/+11 |
| | | | | | | | | May 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 3 | -0/+40 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 3 | -0/+40 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -967/+1155 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -1/+189 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 3 | -0/+99 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 3 | -12763/+12862 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 3 | -0/+25 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 3 | -12760/+12785 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 3 | -0/+27 |
|\| | |||||
| * | Forgotten in previous commit | marha | 2011-03-30 | 1 | -0/+25 |
| | | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 2 | -12532/+12534 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -2/+2 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -589/+589 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 1 | -3/+0 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 1 | -229/+226 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 5 | -1002/+1032 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 5 | -1002/+1032 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-28 | 1 | -334/+335 |
|\| | |||||
| * | libfontenc libXau libxcb mesalib git update 28 jan 2011 | marha | 2011-01-28 | 1 | -334/+335 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-25 | 1 | -1/+1 |
|\| | |||||
| * | mesalib pixman git update 25/1/2011 | marha | 2011-01-25 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 8 | -1273/+2598 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 8 | -1273/+2598 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-16 | 5 | -0/+125 |
|\| | |||||
| * | mesalib git update 16/1/2011 | marha | 2011-01-16 | 4 | -0/+64 |
| | | |||||
| * | mesalib git update 14/1/2011 | marha | 2011-01-15 | 3 | -0/+61 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 17 | -15901/+16288 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 16 | -15900/+16287 |
| | | |||||
* | | Use the same options as in the makefile | marha | 2010-12-23 | 1 | -13/+18 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-29 | 12 | -44/+1125 |
|\| | |||||
| * | Updated to mesalib 7.9 | marha | 2010-11-22 | 12 | -44/+1125 |
| | | |||||
| * | Preperation for new release of mesa | marha | 2010-11-22 | 42 | -0/+21613 |
| | |||||
* | Preperation of new merge with directory moves | marha | 2010-11-22 | 43 | -0/+21628 |