aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp/glcpp.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-12-031-1/+1
|\ | | | | | | | | * origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
| * fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012marha2012-12-031-1/+1
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Merge remote-tracking branch 'origin/released'marha2012-09-171-1/+1
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-121-129/+130
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h
| * git update 12 sep 2011marha2011-09-121-121/+122
| |
* | svn merge ^/branches/released .marha2011-03-051-139/+129
|\|
| * xserver libxcb mesa git update 5 Mar 2011marha2011-03-051-131/+121
| |
* | svn merge ^/branches/released .marha2011-02-011-139/+139
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-131/+131
| |
* | svn merge ^/branches/released .marha2010-12-291-131/+139
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-123/+131
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+8
|/
* Updated to mesalib 7.9marha2010-11-221-0/+123
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 02:06:25 +0000