Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-14 | 2 | -3/+16 | |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in | |||||
| * | libxcb mesa xkeyboard-config git update 14 June 2011 | marha | 2011-06-14 | 2 | -3/+16 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-06 | 1 | -2924/+2940 | |
|\| | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c | |||||
| * | mesa xserver xkb git update 6 Jun 2011 | marha | 2011-06-06 | 1 | -2924/+2940 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-05 | 2 | -0/+112 | |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de | |||||
| * | libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011 | marha | 2011-06-05 | 2 | -0/+112 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 2 | -112/+3 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -112/+3 | |
| | | ||||||
* | | Bumped version to 1.10.11.10.1 | marha | 2011-05-05 | 1 | -1/+1 | |
|\| | | | | | | | | | | | Added release note svn merge ^/branches/released . | |||||
| * | libX11 libxcb mesa git update 5 May 2011 | marha | 2011-05-05 | 1 | -1/+1 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 1 | -1/+2 | |
|\| | ||||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 1 | -2923/+2924 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 13 | -4271/+1824 | |
|\| | ||||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 13 | -3995/+1548 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 2 | -12/+13 | |
|\| | ||||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 2 | -1350/+1351 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-04-10 | 1 | -1/+19 | |
|\| | ||||||
| * | mesa git update | marha | 2011-04-10 | 1 | -1/+19 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 2 | -4/+3 | |
|\| | ||||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 2 | -825/+824 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -326/+329 | |
|\| | ||||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -326/+329 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-03-07 | 1 | -0/+3 | |
|\| | ||||||
| * | Mesa git update 7 Mar 2011 | marha | 2011-03-07 | 1 | -821/+824 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 1 | -0/+1 | |
|\| | ||||||
| * | pixman mesa git update 1 Mar 2011 | marha | 2011-03-01 | 1 | -2851/+2852 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-02-14 | 3 | -374/+1 | |
|\| | ||||||
| * | xkbcomp mesa git update 14 Feb 2011 | marha | 2011-02-14 | 3 | -484/+111 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-02-14 | 3 | -9/+5 | |
|\| | ||||||
| * | xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011 | marha | 2011-02-12 | 3 | -9/+5 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-02-09 | 5 | -814/+839 | |
|\| | ||||||
| * | libX11 mesa git update 9 Feb 2011 | marha | 2011-02-09 | 5 | -5443/+5468 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-02-04 | 2 | -745/+855 | |
|\| | ||||||
| * | libfontenc libXinerama mesa git update 4 feb 2011 | marha | 2011-02-04 | 2 | -740/+850 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-01-25 | 1 | -325/+326 | |
|\| | ||||||
| * | mesa git update 25 jan 2011 | marha | 2011-01-25 | 1 | -325/+326 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-01-24 | 1 | -1206/+1204 | |
|\| | ||||||
| * | mesa git update 24 jan 2011 | marha | 2011-01-24 | 1 | -1206/+1204 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-01-16 | 1 | -5/+6 | |
|\| | ||||||
| * | mesalib git update 16/1/2011 | marha | 2011-01-16 | 1 | -5/+6 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-01-13 | 1 | -0/+3 | |
|\| | ||||||
| * | mesalib pixman xkbcomp git update 13 jan 2011 | marha | 2011-01-13 | 1 | -0/+3 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2011-01-12 | 1 | -5/+2 | |
|\| | ||||||
| * | xkeyboard-config libX11 mesalib git update 12 jan 2011 | marha | 2011-01-12 | 1 | -5/+2 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 53 | -21598/+32356 | |
|\| | ||||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 53 | -21584/+32342 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2010-11-29 | 18 | -374/+1023 | |
|\| | ||||||
| * | Updated to mesalib 7.9 | marha | 2010-11-22 | 18 | -374/+1021 | |
| | | ||||||
* | | svn merge ^/branches/released . | marha | 2010-07-28 | 2 | -9/+29 | |
|\| | ||||||
| * | Update to mesa 7,8,2 | marha | 2010-07-28 | 2 | -9/+29 | |
| | |