projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 84341f4 e5cf3aa)
Merge branch 'glsl2-head' into glsl2
authorEric Anholt <eric@anholt.net>
Thu, 24 Jun 2010 22:47:38 +0000 (15:47 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 24 Jun 2010 22:47:40 +0000 (15:47 -0700)
commitbcc13b74443137043e8a34f8cb64a5add0d8af93
tree5f4e003dceb61c091ce0fcb8c5cf9d91bec033c0tree
parent84341f4b2014810b2964230384fe76338be1d78ecommit | diff
parente5cf3aadb8d57dcc70b597092ecac276042f73cbcommit | diff
Merge branch 'glsl2-head' into glsl2

This brings in the standalone GLSL compiler that we are planning on
replacing the existing Mesa GLSL compiler.  It currently targets GLSL
1.20 and the Mesa IR.