aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/enable.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-08-051-9/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/texcompress_rgtc_tmp.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_print.c mesalib/src/mesa/program/prog_statevars.c mesalib/src/mesa/program/program.c mesalib/src/mesa/program/program_parse.y mesalib/src/mesa/program/program_parser.h mesalib/src/mesa/program/sampler.cpp mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.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_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/vbo/vbo_exec_array.c pixman/pixman/pixman-arm-neon-asm.S pixman/pixman/pixman-arm-neon.c
| * mesa pixman git update 5 aug 2011marha2011-08-051-9/+2
| |
* | svn merge ^/branches/released .marha2011-05-031-2/+5
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-1425/+1428
|/
* xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-1487/+1425
|
* pixman mesa git update 1 Mar 2011marha2011-03-011-1501/+1487
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1504/+1501
|
* mesa git update 7 Feb 2011marha2011-02-071-1503/+1504
|
* mesalib git update 22/1/2011marha2011-01-221-0/+11
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+1
|
* xserver and mesa git update 28-12-2010marha2010-12-281-1567/+1491
|
* Updated to mesalib 7.9marha2010-11-221-24/+91
|
* Updated to following packages:marha2010-04-021-6/+86
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-071-13/+26
|
* Added MesaLib-7.6marha2009-10-081-0/+1407