aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/link_uniforms.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-201-1/+1
|\
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-201-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-131-2/+58
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-131-2/+58
| |
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-061-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-251-5/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-251-5/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-171-2/+44
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-2/+44
| |
* | Solved compile problem in debugmarha2011-11-101-2/+1
|/
* libX11 mesa pixman git update 9 nov 2011marha2011-11-091-0/+249
|
* libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-0/+85