aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_draw.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-271-1/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
| * xwininfo fontconfig mesa pixman git update 27 June 2011marha2011-06-271-1/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-151-36/+25
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
| * mesa xserver git update 15 June 2011marha2011-06-151-36/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-131-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
| * libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵marha2011-06-131-1/+2
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-091-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
| * mesa xkbcomp xkeyboard-config git update 9 Jun 2011marha2011-06-091-3/+4
| |
* | svn merge ^/branches/released .marha2011-04-281-1/+1
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-790/+790
|/
* mesa git updatemarha2011-04-101-784/+790
|
* xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-58/+69
|
* xserver mesa git update 10 Mar 2011marha2011-03-101-4/+2
|
* xkeyboard-config mesa git update 2 Mar 2011marha2011-03-021-12/+23
|
* xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-0/+2
|
* xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-251-3/+6
|
* xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-221-751/+759
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-749/+751
|
* pixman mesa git update 16 Feb 2011marha2011-02-161-788/+749
|
* mesalib git update 16/1/2011marha2011-01-161-5/+15
|
* xkeyboard-config and mesa git update 9/1/2011marha2011-01-091-0/+1
|
* xserver and mesa git update 28-12-2010marha2010-12-281-0/+777
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 21:07:52 +0000