aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-098-13368/+13335
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-098-13368/+13335
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-8/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c
| * xserver libX11 mesa git update 8 Jun 2011marha2011-06-081-8/+37
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0310-15236/+15222
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0310-15236/+15222
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-011-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-301-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-0/+2
| |/
* | Merge remote-tracking branch 'origin/released'marha2011-05-299-1422/+1803
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-299-2040/+2421
| |
* | merge ^/branches/released .marha2011-05-251-101/+19
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-251-951/+869
| |
* | merge ^/branches/released .marha2011-05-243-6/+4
|\|
| * xserver mesa git update 24 May 2011marha2011-05-243-2879/+2877
| |
* | svn merge ^/branches/released .marha2011-05-229-2806/+10260
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-229-7631/+15085
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-183-22/+17
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-183-3207/+3202
| |
* | merge ^/branches/released .marha2011-05-132-1/+2
|\|
| * mesa git update 13 May 2011marha2011-05-132-1/+2
| |
* | merge ^/branches/released .marha2011-05-121-3/+3
|\|
| * libxcb mesa xcb-proto git update 12 May 2011marha2011-05-121-3/+3
| |
* | svn merge ^/branches/released .marha2011-05-102-1/+2
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-102-1/+2
| |
* | svn merge ^/branches/released .marha2011-05-096-5/+96
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-096-1463/+1554
| |
* | svn merge ^/branches/released .marha2011-05-042-109/+0
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-042-109/+0
| |
* | svn merge ^/branches/released .marha2011-05-033-1509/+1525
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-033-3932/+3948
| |
* | svn merge ^/branches/released .marha2011-05-024-29/+2
|\|
| * mesa git update 1 May 2011marha2011-05-024-7717/+7690
| |
* | svn merge ^/branches/released .marha2011-04-3015-38/+524
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-3015-26352/+26838
| |
* | svn merge ^/branches/released .marha2011-04-281-0/+4
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-0/+4
| |
* | svn merge ^/branches/released .marha2011-04-2738-6841/+8197
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2738-14124/+15480
| |
* | svn merge ^/branches/released .marha2011-04-159-9/+256
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-159-3588/+3835
| |
* | svn merge ^/branches/released .marha2011-04-146-1369/+1373
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-146-2220/+2224
| |
* | svn merge ^/branches/released .marha2011-04-1219-3500/+5207
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-1219-34626/+36332
| |
* | svn merge ^/branches/released .marha2011-04-103-5/+7
|\|
| * mesa git updatemarha2011-04-103-1010/+1012
| |
* | Solved compilation problemmarha2011-04-071-1/+1
| |
* | svn merge ^/branches/released .marha2011-04-075-1269/+1241
|\|
| * xserver pixman mesa git update 7 Apr 2011marha2011-04-075-860/+832
| |