aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ast.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-161-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-161-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-101-72/+10
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-101-72/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-091-0/+13
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-091-0/+13
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-091-4/+79
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-091-4/+79
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-041-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-041-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-091-2/+1
|\| | | | | | | | | | | | | | | | | | | | | 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/+1
| |
* | svn merge ^/branches/released .marha2011-02-011-6/+6
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-5/+5
| |
* | svn merge ^/branches/released .marha2011-01-271-732/+740
|\|
| * pixman and mesalib git update 27 jan 2011marha2011-01-271-728/+736
| |
* | svn merge ^/branches/released .marha2011-01-221-751/+732
|\|
| * mesalib git update 22/1/2011marha2011-01-221-747/+728
| |
* | svn merge ^/branches/released .marha2011-01-191-729/+751
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-191-725/+747
| |
* | svn merge ^/branches/released .marha2011-01-081-1/+5
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-1/+5
| |
* | svn merge ^/branches/released .marha2010-12-291-702/+725
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-698/+721
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+4
|/
* Updated to mesalib 7.9marha2010-11-221-0/+698
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 05:03:29 +0000