aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glsl_parser_extras.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-011-109/+218
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-011-109/+218
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-051-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-051-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-101-0/+8
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-101-0/+8
| |
* | svn merge ^/branches/released .marha2011-05-031-0/+10
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-0/+10
| |
* | svn merge ^/branches/released .marha2011-04-141-1/+1
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-1/+1
| |
* | svn merge ^/branches/released .marha2011-04-121-13/+12
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-13/+12
| |
* | svn merge ^/branches/released .marha2011-03-021-0/+5
|\|
| * pixman mesa git update 1 Mar 2011marha2011-03-011-0/+5
| |
* | svn merge ^/branches/released .marha2011-02-091-826/+826
|\|
| * libX11 mesa git update 9 Feb 2011marha2011-02-091-1/+1
|/
* mesa git update 7 Feb 2011marha2011-02-071-0/+1
|
* libX11 mesalib git update 2 Feb 2011marha2011-02-021-1/+1
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-11/+41
|
* pixman and mesalib git update 27 jan 2011marha2011-01-271-0/+7
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-191-786/+788
|
* mesalib git update 16/1/2011marha2011-01-161-0/+9
|
* xserver and mesa git update 28-12-2010marha2010-12-281-762/+777
|
* Updated to mesalib 7.9marha2010-11-221-0/+762