aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glsl_symbol_table.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-221-0/+1
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-configmarha2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2012-12-101-1/+2
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-101-1/+2
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | svn merge ^/branches/released .marha2011-02-011-131/+129
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-126/+124
| |
* | svn merge ^/branches/released .marha2010-12-291-126/+131
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-121/+126
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+5
|/
* Updated to mesalib 7.9marha2010-11-221-0/+121