aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/program_parse.y
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-121-2806/+2806
|
* Merge remote-tracking branch 'origin/released'marha2011-08-051-28/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-28/+28
| |
* | svn merge ^/branches/released .marha2011-04-281-1/+5
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+5
| |
* | svn merge ^/branches/released .marha2011-04-271-3/+8
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-3/+8
| |
* | svn merge ^/branches/released .marha2011-04-141-0/+29
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-0/+29
| |
* | svn merge ^/branches/released .marha2011-03-041-2/+2
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-2768/+2768
|/
* xserver and mesa git update 28-12-2010marha2010-12-281-2768/+2768
|
* Added missing needed files for mesalibmarha2010-11-231-0/+2768