aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-072-432/+433
|\ | | | | | | | | Conflicts: xorg-server/randr/rrcrtc.c
| * git update xserver mesa 7 Jun 2011marha2011-06-072-432/+433
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-061-2924/+2940
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c
| * mesa xserver xkb git update 6 Jun 2011marha2011-06-061-2924/+2940
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-054-2/+114
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-054-2/+114
| |
* | Synchronised files with mesamarha2011-06-031-0/+18
| |
* | Cleaned outputmarha2011-06-031-3/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0325-19884/+19861
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0325-19884/+19861
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-0110-1401/+1457
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-3010-1401/+1457
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3010-1401/+1457
| |/
* | Added gitignore filesmarha2011-05-303-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-2918-2239/+2630
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2918-2857/+3248
| |
* | merge ^/branches/released .marha2011-05-252-1006/+570
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-252-2643/+2207
| |
* | merge ^/branches/released .marha2011-05-244-6/+9
|\|
| * xserver mesa git update 24 May 2011marha2011-05-244-3117/+3120
| |
* | svn merge ^/branches/released .marha2011-05-2220-2827/+10709
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-2220-14290/+22169
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-184-23/+23
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-184-3208/+3208
| |
* | merge ^/branches/released .marha2011-05-168-188/+280
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-168-1706/+1798
| |
* | merge ^/branches/released .marha2011-05-132-1/+2
|\|
| * mesa git update 13 May 2011marha2011-05-132-1/+2
| |
* | merge ^/branches/released .marha2011-05-122-3/+9
|\|
| * libxcb mesa xcb-proto git update 12 May 2011marha2011-05-122-3/+9
| |
* | svn merge ^/branches/released .marha2011-05-107-17/+41
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-107-17/+41
| |
* | svn merge ^/branches/released .marha2011-05-099-6/+108
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-099-2062/+2164
| |
* | Bumped version to 1.10.11.10.1marha2011-05-051-1/+1
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
| * libX11 libxcb mesa git update 5 May 2011marha2011-05-051-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-043-110/+1
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-043-110/+1
| |
* | svn merge ^/branches/released .marha2011-05-0318-1702/+1910
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-0318-4125/+4333
| |
* | svn merge ^/branches/released .marha2011-05-029-48/+29
|\|
| * mesa git update 1 May 2011marha2011-05-029-9861/+9842
| |
* | svn merge ^/branches/released .marha2011-04-30153-494/+35422
|\|
| * Added extra needed filesmarha2011-04-30133-0/+34328
| |
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-3020-33512/+34112
| |
* | Synchronised filesmarha2011-04-291-4/+2
| |
* | svn merge ^/branches/released .marha2011-04-291-0/+7
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-1089/+1096
| |
* | svn merge ^/branches/released .marha2011-04-287-8/+41
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-287-797/+830
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 05:33:22 +0000