aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
Commit message (Collapse)AuthorAgeFilesLines
* 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-092-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-5/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-071-1/+2
|\| | | | | | | | | Conflicts: xorg-server/randr/rrcrtc.c
| * git update xserver mesa 7 Jun 2011marha2011-06-071-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-031-0/+8
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-018-782/+839
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-308-782/+839
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/state_tracker/st_cb_blit.c 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.c
| * | mesa git update 30 May 2011marha2011-05-308-782/+839
| |/
* | Merge remote-tracking branch 'origin/released'marha2011-05-297-816/+824
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-297-816/+824
| |
* | merge ^/branches/released .marha2011-05-251-905/+551
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-251-1692/+1338
| |
* | svn merge ^/branches/released .marha2011-05-225-11/+15
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-225-649/+653
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-166-157/+233
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-166-433/+509
| |
* | svn merge ^/branches/released .marha2011-05-092-0/+11
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-092-598/+609
| |
* | svn merge ^/branches/released .marha2011-05-031-39/+71
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-39/+71
| |
* | svn merge ^/branches/released .marha2011-05-022-12/+0
|\|
| * mesa git update 1 May 2011marha2011-05-022-1553/+1541
| |
* | svn merge ^/branches/released .marha2011-04-303-0/+51
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-303-3782/+3833
| |
* | svn merge ^/branches/released .marha2011-04-283-6/+27
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-283-795/+816
| |
* | svn merge ^/branches/released .marha2011-04-276-48/+40
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-276-501/+493
| |
* | svn merge ^/branches/released .marha2011-04-154-2/+275
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-154-2/+275
| |
* | svn merge ^/branches/released .marha2011-04-141-4/+8
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-4/+8
| |
* | svn merge ^/branches/released .marha2011-04-126-24/+55
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-126-3028/+3059
| |
* | svn merge ^/branches/released .marha2011-04-107-374/+399
|\|
| * mesa git updatemarha2011-04-107-1664/+1689
| |
* | svn merge ^/branches/released .marha2011-04-063-4/+7
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-063-893/+896
| |
* | svn merge ^/branches/released .marha2011-04-052-59/+93
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-052-700/+734
| |
* | svn merge ^/branches/released .marha2011-03-308-12/+331
|\|
| * mesa git update 30 Mar 2011marha2011-03-308-2754/+3073
| |
* | svn merge ^/branches/released .marha2011-03-281-0/+3
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-208/+211
| |
* | svn merge ^/branches/released .marha2011-03-173-4/+4
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-173-1843/+1843
| |
* | svn merge ^/branches/released .marha2011-03-155-5/+112
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 20:21:58 +0000