aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/list.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-09-231-36/+2
|\ | | | | | | | | | | | | | | | | | | | | | | * origin/released: mesa xserver git update 23 Sep 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/glsl_symbol_table.cpp mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/list.h
| * mesa xserver git update 23 Sep 2013marha2013-09-231-36/+2
| | | | | | | | | | xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b mesa commit 6d29db715b8d60718ada1ab8ad19d969cac43caf
* | svn merge ^/branches/released .marha2011-02-011-18/+14
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-16/+12
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+8
|/
* Updated to mesalib 7.9marha2010-11-221-0/+505