aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-181-1022/+1022
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * pixman git update 18 July 2011marha2011-07-181-1022/+1022
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-052-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 2011marha2011-06-052-0/+112
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-032-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 2011marha2011-06-032-112/+3
| |
* | svn merge ^/branches/released .marha2011-04-271-122/+0
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-1038/+916
| |
* | svn merge ^/branches/released .marha2011-04-121-3/+4
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-1341/+1342
| |
* | svn merge ^/branches/released .marha2011-04-101-1/+19
|\|
| * mesa git updatemarha2011-04-101-1/+19
| |
* | svn merge ^/branches/released .marha2011-04-062-4/+3
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-062-825/+824
| |
* | svn merge ^/branches/released .marha2011-03-071-0/+3
|\|
| * Mesa git update 7 Mar 2011marha2011-03-071-821/+824
| |
* | svn merge ^/branches/released .marha2011-02-143-374/+1
|\|
| * xkbcomp mesa git update 14 Feb 2011marha2011-02-143-484/+111
| |
* | svn merge ^/branches/released .marha2011-02-141-7/+5
|\|
| * xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-7/+5
| |
* | svn merge ^/branches/released .marha2011-02-093-812/+836
|\|
| * libX11 mesa git update 9 Feb 2011marha2011-02-093-1570/+1594
| |
* | svn merge ^/branches/released .marha2011-02-042-745/+855
|\|
| * libfontenc libXinerama mesa git update 4 feb 2011marha2011-02-042-740/+850
| |
* | svn merge ^/branches/released .marha2011-01-131-0/+3
|\|
| * mesalib pixman xkbcomp git update 13 jan 2011marha2011-01-131-0/+3
| |
* | svn merge ^/branches/released .marha2010-12-2924-9637/+9968
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-2824-9623/+9954
| |
* | svn merge ^/branches/released .marha2010-11-2916-334/+997
|\|
| * Updated to mesalib 7.9marha2010-11-2216-334/+995
| |
* | svn merge ^/branches/released .marha2010-07-281-1/+1
|\|
| * Update to mesa 7,8,2marha2010-07-281-1/+1
| |
| * Updated to following packages:marha2010-04-0217-308/+188
| | | | | | | | | | mesa-7.8
* | svn merge -r524:HEAD "^/branches/released" .marha2010-04-1217-308/+188
| |
* | svn merge ^/branches/released .marha2010-03-0714-7129/+378
|\|
| * Updated to Mesa 7.7marha2010-03-0714-7129/+378
| |
* | svn merge ^/branches/releasedmarha2009-12-221-0/+191
|\|
| * Forgotten files in previous commitmarha2009-12-221-0/+191
| |
* | svn merge ^/branches/releasedmarha2009-12-221-1/+1
|\|
| * Updated to mesa_7_6_1_rc1marha2009-12-221-1/+1
| |
* | Opengl is working now.marha2009-10-092-2/+14
|/
* Added MesaLib-7.6marha2009-10-0840-0/+19366