aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/vbo
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-151-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
| * xserver libX11 mesa git update 15 Julymarha2011-07-151-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-271-251/+249
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251/+249
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-141-4/+4
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
| * libxcb mesa xkeyboard-config git update 14 June 2011marha2011-06-141-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-094-2009/+2108
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-094-2009/+2108
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-1/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+26
| |
* | svn merge ^/branches/released .marha2011-04-271-6/+2
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-1341/+1337
| |
* | svn merge ^/branches/released .marha2011-04-106-627/+642
|\|
| * mesa git updatemarha2011-04-106-3814/+3829
| |
* | svn merge ^/branches/released .marha2011-03-101-1/+12
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-101-1/+12
| |
* | svn merge ^/branches/released .marha2011-03-041-1/+1
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-1/+1
| |
* | svn merge ^/branches/released .marha2011-03-026-30/+52
|\|
| * xkeyboard-config mesa git update 2 Mar 2011marha2011-03-025-2053/+2074
| |
| * pixman mesa git update 1 Mar 2011marha2011-03-011-0/+1
| |
* | svn merge ^/branches/released .marha2011-02-234-185/+204
|\|
| * xserver pixman mesa git update 23 Feb 2011marha2011-02-234-1319/+1338
| |
* | svn merge ^/branches/released .marha2011-02-223-86/+117
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-223-1289/+1320
| |
* | svn merge ^/branches/released .marha2011-02-201-0/+25
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1282/+1307
| |
* | svn merge ^/branches/released .marha2011-02-163-0/+7
|\|
| * pixman mesa git update 16 Feb 2011marha2011-02-163-2001/+2008
|/
* xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-173/+173
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-192-909/+911
|
* mesa git update 17 jan 2011marha2011-01-172-10/+11
|
* xkeyboard-config and mesa git update 9/1/2011marha2011-01-099-0/+9
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-1/+0
|
* mesa git update 31/12/2010marha2010-12-311-1/+4
|
* xserver and mesa git update 28-12-2010marha2010-12-2820-7710/+8127
|
* Updated to mesalib 7.9marha2010-11-2213-93/+323
|
* Updated to following packages:marha2010-04-0214-259/+274
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-0710-117/+455
|
* Updated to mesa_7_6_1_rc1marha2009-12-223-1/+11
|
* Added MesaLib-7.6marha2009-10-0822-0/+7286