aboutsummaryrefslogtreecommitdiff
path: root/mesalib/scons
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-121-166/+174
|\ | | | | | | | | | | | | 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-166/+174
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-042-48/+106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-042-48/+106
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-202-4/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-202-4/+24
| |
* | Bumped version to 1.10.11.10.1marha2011-05-052-1/+2
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
| * libX11 libxcb mesa git update 5 May 2011marha2011-05-052-624/+625
| |
* | svn merge ^/branches/released .marha2011-04-061-72/+0
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-72/+0
| |
* | svn merge ^/branches/released .marha2011-03-133-211/+166
|\|
| * xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-133-835/+790
| |
* | svn merge ^/branches/released .marha2011-03-042-0/+4
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-042-169/+173
| |
* | svn merge ^/branches/released .marha2011-02-251-0/+2
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-251-621/+623
|/
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1/+2
|
* xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-590/+620
|
* libX11 mesa git update 10 Feb 2011marha2011-02-101-2/+8
|
* libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-198/+201
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-012-748/+750
|
* xserver and mesa git update 28-12-2010marha2010-12-2815-0/+2467