aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glsl_symbol_table.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-03-281-25/+0
|\ | | | | | | | | Conflicts: X11/xtrans/Xtrans.c
| * libxtrans fontconfig mesa xserver git update 28 Mar 2014marha2014-03-281-25/+0
| | | | | | | | | | | | | | xserver commit a2880699e8f1f576e1a48ebf25e8982463323f84 libxtrans commit 68f60238c4224f954ff6556ae778c72e420175f0 fontconfig commit fcba9ef01c978323fc71c17e455d3cd6ae35edcc mesa commit 029ccd773d01a5f801c809c499516d7b0c4cc3f8
* | Merge remote-tracking branch 'origin/released'marha2013-10-161-0/+15
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/drisw_util.c pixman/pixman/pixman-mmx.c
| * fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 ↵marha2013-10-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | oct 2013 xserver commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859 libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6 libxcb/xcb-proto commit 55c75accecf0e76d2aa38656efd2be4044b9e643 xkbcomp commit 839ccda42d8b088d94324cd77c4be954859914d3 pixman commit 9e81419ed5c0ee490ddacf7bada516a25cae87eb fontconfig commit 5406919c5e186f74ccdade1a65344ce7b5c56a64 mesa commit 6e444a72c1f9e4446e025b8cb780523cb89f0584
* | Merge remote-tracking branch 'origin/released'marha2013-09-231-14/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-14/+1
| | | | | | | | | | xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b mesa commit 6d29db715b8d60718ada1ab8ad19d969cac43caf
* | Merge remote-tracking branch 'origin/released'marha2013-07-161-7/+14
|\| | | | | | | | | | | | | | | * origin/released: libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013 Conflicts: mesalib/src/glsl/glsl_symbol_table.cpp
| * libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013marha2013-07-161-7/+14
| | | | | | | | | | | | | | libxcb commit 45619dc71e9411a526d7c69595cf615b1b1206cf libxcb/xcb-proto commit 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32 xkbcomp commit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d mesa commit e4fdf1b008ce29c5b5a52985c586b61f35d31e4c
* | solved compilation problemmarha2013-07-161-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-121-4/+25
|\| | | | | | | | | * origin/released: libxtrans fontconfig mesa xserver git update 12 Jul 2013
| * libxtrans fontconfig mesa xserver git update 12 Jul 2013marha2013-07-121-4/+25
| | | | | | | | | | | | | | xserver commit 59a6d3f1eb03010ab831b32b03706a1d6143c732 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 mesa commit 1b0d6aef03161eff4c9933548e964fec1258ea44
| * xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb ↵marha2013-06-041-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013 xserver commit c21344add2fc589df83b29be5831c36a372201bd libxcb commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12 libxcb/xcb-proto commit bdfedfa57a13ff805580cfacafc70f9cc55df363 xkeyboard-config commit dad9ade4e83d1ef5a517fcc4cc9ad3a79b47acce libX11 commit 8496122eb00ce6cd5d2308ee54f64b68c378e455 libXdmcp commit 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 libXext commit d8366afbb0d2e4fbb1e419b1187f490522270bea libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 pixman commit 2acfac5f8e097ee2ae225d986f981b55d65dd152 mkfontscale commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 fontconfig commit cd9b1033a68816a7acfbba1718ba0aa5888f6ec7 mesa commit 7bafd88c153e395274b632e7eae4bc9fc3aec1d2
* | xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb ↵marha2013-06-041-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013 xserver commit c21344add2fc589df83b29be5831c36a372201bd libxcb commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12 libxcb/xcb-proto commit bdfedfa57a13ff805580cfacafc70f9cc55df363 xkeyboard-config commit dad9ade4e83d1ef5a517fcc4cc9ad3a79b47acce libX11 commit 8496122eb00ce6cd5d2308ee54f64b68c378e455 libXdmcp commit 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 libXext commit d8366afbb0d2e4fbb1e419b1187f490522270bea libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 pixman commit 2acfac5f8e097ee2ae225d986f981b55d65dd152 mkfontscale commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 fontconfig commit cd9b1033a68816a7acfbba1718ba0aa5888f6ec7 mesa commit 7bafd88c153e395274b632e7eae4bc9fc3aec1d2
* | Merge remote-tracking branch 'origin/released'marha2013-01-281-11/+3
|\| | | | | | | | | * origin/released: mesa mkfontscale pixman git update 28 jan 2013
| * mesa mkfontscale pixman git update 28 jan 2013marha2013-01-281-11/+3
| | | | | | | | | | | | mesa: 87592cff57feef29565150b9203e220b50623f30 mkfontscale: b3af8de8d25128f565c2ed2f7c63b6e4099eb84e pixman: 65fc1adb6545737058e938105ae948a3607c277c
* | Merge remote-tracking branch 'origin/released'marha2013-01-221-3/+11
|\| | | | | | | | | | | | | | | | | | | | | * 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-3/+11
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2012-12-101-3/+3
|\| | | | | | | | | | | | | | | * 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-3/+3
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Synchronised line endinge with release branchmarha2011-09-121-169/+169
| |
* | svn merge ^/branches/released .marha2011-03-171-168/+169
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-0/+1
| |
* | svn merge ^/branches/released .marha2011-02-011-8/+8
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-7/+7
| |
* | svn merge ^/branches/released .marha2011-01-211-172/+168
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-167/+164
| |
* | svn merge ^/branches/released .marha2010-12-291-165/+172
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-160/+167
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+5
|/
* Updated to mesalib 7.9marha2010-11-221-0/+160