aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/link_functions.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-08-091-2/+4
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/randr.h mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_program.c
| * xrandrproto mesa git update 9 aug 2011marha2011-08-091-2/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/mesa/program/ir_to_mesa.cpp xorg-server/composite/compalloc.c xorg-server/configure.ac xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Makefile.am xorg-server/hw/xquartz/xpr/xprFrame.c xorg-server/include/windowstr.h
| * randrproto mesa xserver git update 4 aug 2011marha2011-08-041-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-181-5/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * pixman git update 18 July 2011marha2011-07-181-5/+17
| |
* | svn merge ^/branches/released .marha2011-03-101-1/+7
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-101-1/+7
| |
* | svn merge ^/branches/released .marha2011-02-221-270/+266
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-221-4/+0
|/
* mesa xkeyboard-config git update 26 jan 2011marha2011-01-261-258/+270
|
* mesalib git update 22/1/2011marha2011-01-221-4/+0
|
* xserver and mesa git update 28-12-2010marha2010-12-281-262/+262
|
* Updated to mesalib 7.9marha2010-11-221-0/+262
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 14:41:41 +0000