aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/shaderapi.c
Commit message (Collapse)AuthorAgeFilesLines
* 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-291-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-4/+4
| |
* | svn merge ^/branches/released .marha2011-05-021-9/+1
|\|
| * mesa git update 1 May 2011marha2011-05-021-1946/+1938
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-0/+1
|
* libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1942/+1945
|
* libX11 mesa git update 9 Feb 2011marha2011-02-091-0/+11
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-4/+4
|
* xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-0/+1
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-191-1891/+1930
|
* mesalib git update 14/1/2011marha2011-01-151-2/+5
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+2
|
* xserver and mesa git update 28-12-2010marha2010-12-281-1642/+1886
|
* Updated to mesalib 7.9marha2010-11-221-0/+1642