aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/main.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-10-011-0/+1
|\
| * libxtrans pixman fontconfig mesa xserver xkeyboard-config git update 1 Oct 2014marha2014-10-011-0/+1
* | Merge remote-tracking branch 'origin/released'marha2014-05-111-0/+6
|\|
| * xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014marha2014-05-081-0/+6
* | Merge remote-tracking branch 'origin/released'marha2014-03-041-1/+1
|\|
| * libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014marha2014-03-041-1/+1
* | Merge remote-tracking branch 'origin/released'marha2014-02-071-1/+15
|\|
| * xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserv...marha2014-02-071-1/+15
* | Merge remote-tracking branch 'origin/released'marha2014-01-151-63/+64
|\|
| * randrproto libfontenc mesa xserver git update 10 Jan 2014marha2014-01-101-63/+64
* | Merge remote-tracking branch 'origin/released'marha2013-10-161-17/+180
|\|
| * fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 ...marha2013-10-161-17/+180
* | Merge remote-tracking branch 'origin/released'marha2013-09-101-1/+1
|\|
| * fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013marha2013-09-101-1/+1
* | Merge remote-tracking branch 'origin/released'marha2013-08-261-1/+1
|\|
| * xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git u...marha2013-08-261-1/+1
* | Merge remote-tracking branch 'origin/released'marha2013-06-281-59/+1
|\|
| * libXext mesa git update 29 June 20013marha2013-06-261-59/+1
| * xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb li...marha2013-06-041-1/+3
| * fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-04-111-1/+1
* | xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb li...marha2013-06-041-1/+3
* | Merge remote-tracking branch 'origin/released'marha2013-03-251-1/+1
|\ \
| * | fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-03-251-1/+1
| |/
* | Merge remote-tracking branch 'origin/released'marha2013-01-141-1/+1
|\|
| * libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscalemarha2013-01-141-1/+1
* | Merge remote-tracking branch 'origin/released'marha2012-12-101-0/+2
|\|
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-101-0/+2
* | Merge remote-tracking branch 'origin/released'marha2012-12-031-1/+1
|\|
| * fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012marha2012-12-031-1/+1
* | Merge remote-tracking branch 'origin/released'marha2012-09-171-1/+1
|\|
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-1/+1
* | Merge remote-tracking branch 'origin/released'marha2012-04-301-0/+9
|\|
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-301-0/+9
* | Merge remote-tracking branch 'origin/released'marha2012-04-201-1/+1
|\|
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-201-1/+1
* | Merge remote-tracking branch 'origin/released'marha2012-03-261-3/+3
|\|
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231-3/+3
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-1/+1
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-1/+1
* | Synchronised line endinge with release branchmarha2011-09-121-292/+292
* | Merge remote-tracking branch 'origin/released'marha2011-08-291-1/+0
|\|
| * xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29marha2011-08-291-1/+0
* | Merge remote-tracking branch 'origin/released'marha2011-08-041-0/+1
|\|
| * randrproto mesa xserver git update 4 aug 2011marha2011-08-041-0/+1
* | Merge remote-tracking branch 'origin/released'marha2011-07-261-57/+3
|\|
| * libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011marha2011-07-261-57/+3
* | Merge remote-tracking branch 'origin/released'marha2011-06-271-0/+1
|\|
| * xwininfo fontconfig mesa pixman git update 27 June 2011marha2011-06-271-0/+1
* | svn merge ^/branches/released .marha2011-02-221-347/+345
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-221-2/+0