Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-13 | 8 | -203/+8151 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de | ||||
| * | libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵ | marha | 2011-06-13 | 8 | -203/+8151 |
| | | | | | | | | update 13 Jun 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-09 | 3 | -23/+26 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in | ||||
| * | mesa xkbcomp xkeyboard-config git update 9 Jun 2011 | marha | 2011-06-09 | 3 | -23/+26 |
| | | |||||
* | | Synchronised files with mesa | marha | 2011-06-03 | 1 | -0/+18 |
| | | |||||
* | | Cleaned output | marha | 2011-06-03 | 1 | -3/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 9 | -4297/+4384 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -4297/+4384 |
| | | |||||
* | | 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 | 9 | -151/+279 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 9 | -151/+279 |
| | | |||||
* | | Synchronised files | marha | 2011-04-29 | 1 | -4/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 11 | -4885/+6405 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 11 | -3919/+5439 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 10 | -4046/+4967 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 10 | -74591/+75512 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 10 | -4053/+4137 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 10 | -74529/+74613 |
| | | |||||
* | | Synchronised files | marha | 2011-04-01 | 1 | -42/+41 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 10 | -4152/+4238 |
|\| | |||||
| * | Forgotten in previous commit | marha | 2011-03-30 | 1 | -0/+25 |
| | | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 9 | -53541/+53602 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 4 | -7/+7 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 4 | -22514/+22514 |
| | | |||||
* | | 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 | 12 | -48638/+48719 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 12 | -48638/+48719 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-07 | 3 | -18/+5 |
|\| | |||||
| * | Mesa git update 7 Mar 2011 | marha | 2011-03-07 | 3 | -729/+716 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-29 | 1 | -67/+77 |
|\| | |||||
| * | libXext libfontenc libXau libX11 libXinerama mesa libXdmcp git update 28 jan ↵ | marha | 2011-01-29 | 1 | -67/+77 |
| | | | | | | | | 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-01-28 | 2 | -34467/+34469 |
|\| | |||||
| * | libfontenc libXau libxcb mesalib git update 28 jan 2011 | marha | 2011-01-28 | 2 | -34467/+34469 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-25 | 2 | -2/+2 |
|\| | |||||
| * | mesalib pixman git update 25/1/2011 | marha | 2011-01-25 | 2 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-22 | 3 | -103/+103 |
|\| | |||||
| * | mesalib git update 22/1/2011 | marha | 2011-01-22 | 3 | -103/+103 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 20 | -2652/+18025 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 20 | -2652/+18025 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-16 | 11 | -3347/+3960 |
|\| | |||||
| * | mesalib git update 16/1/2011 | marha | 2011-01-16 | 10 | -3365/+3677 |
| | | |||||
| * | mesalib git update 14/1/2011 | marha | 2011-01-15 | 9 | -3146/+3447 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 50 | -69985/+68202 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 49 | -69980/+68197 |
| | |