aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-152-746/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-746/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-121-11049/+11127
|\| | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
| * mesa git update 12 July 2011marha2011-07-121-11049/+11127
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-272-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-0/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-3015-5602/+5602
|\|
| * Synchronised files. The revision number was removedmarha2011-05-3015-5602/+5602
| |
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-398/+398
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-131-353/+353
|\|
| * mesa git update 13 May 2011marha2011-05-131-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-092-0/+2
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-092-397/+399
| |
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-302-523/+523
| |
* | svn merge ^/branches/released .marha2011-04-272-4/+3
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-272-524/+523
| |
* | svn merge ^/branches/released .marha2011-03-201-2241/+2241
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-2241/+2241
| |
| * xserver libxcb mesa git update 5 Mar 2011marha2011-03-051-398/+398
| |
* | svn merge ^/branches/released .marha2011-03-021-0/+14
|\|
| * xkeyboard-config mesa git update 2 Mar 2011marha2011-03-021-384/+398
| |
| * xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-126/+126
| |
* | svn merge ^/branches/released .marha2011-02-101-0/+6
|\|
| * libX11 mesa git update 10 Feb 2011marha2011-02-101-120/+126
| |
* | svn merge ^/branches/released .marha2011-02-091-881/+889
|\|
| * libX11 mesa git update 9 Feb 2011marha2011-02-091-0/+8
| |
* | svn merge ^/branches/released .marha2011-02-041-1/+8
|\|
| * libfontenc libXinerama mesa git update 4 feb 2011marha2011-02-041-1/+8
| |
* | svn merge ^/branches/released .marha2011-01-281-873/+874
|\|
| * libfontenc libXau libxcb mesalib git update 28 jan 2011marha2011-01-281-871/+872
| |
* | svn merge ^/branches/released .marha2011-01-131-329/+329
|\|
| * mesalib pixman xkbcomp git update 13 jan 2011marha2011-01-131-329/+329
| |
* | svn merge ^/branches/released .marha2011-01-121-864/+873
|\|
| * xkeyboard-config libX11 mesalib git update 12 jan 2011marha2011-01-121-862/+871
| |
* | svn merge ^/branches/released .marha2011-01-081-2/+12
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-2/+12
| |
* | svn merge ^/branches/released .marha2010-12-2919-17936/+18899
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-2819-17936/+18899
| |
* | svn merge ^/branches/released .marha2010-11-2920-868/+2753
|\|
| * Updated to mesalib 7.9marha2010-11-2219-868/+2625
| |
* | svn merge ^/branches/released .marha2010-07-282-1595/+2215
|\|
| * Update to mesa 7,8,2marha2010-07-282-1595/+2215
| |
* | svn merge ^/branches/released .marha2010-06-161-103/+106
|\|
| * Updated to mesa-7.8.1marha2010-06-161-103/+106
| |
| * Updated to following packages:marha2010-04-0217-417/+1763
| | | | | | | | | | mesa-7.8
* | svn merge -r524:HEAD "^/branches/released" .marha2010-04-1217-417/+1763
| |
* | svn merge ^/branches/released .marha2010-03-0710-16522/+1
|\|
| * Updated to Mesa 7.7marha2010-03-0710-16522/+1
| |