mesa/progs
Chia-I Wu 562c127693 Merge branch 'master' into opengl-es-v2
Conflicts:
	src/mesa/main/dd.h
2010-01-12 11:25:02 +08:00
..
beos Remove CVS keywords. 2008-09-21 11:00:44 -07:00
demos Merge branch 'mesa_7_7_branch' 2010-01-08 08:21:12 -07:00
directfb Ignore more generated files in progs/ 2008-05-20 19:04:57 -04:00
egl progs/egl: Fix screen surface demos. 2010-01-12 10:55:35 +08:00
es1 progs/es1: Add compressed paletted texture tests to torus. 2010-01-04 14:15:16 -07:00
es2 progs/es: Add .gitignore. 2009-11-10 11:23:47 -07:00
fbdev Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11 16:05:15 +01:00
fp Merge branch 'mesa_7_7_branch' 2010-01-08 08:21:12 -07:00
ggi Remove CVS keywords. 2008-09-21 11:00:44 -07:00
glsl Merge branch 'mesa_7_7_branch' 2010-01-08 08:21:12 -07:00
images new test image - Delicate Arch, Utah 2006-05-10 22:44:26 +00:00
miniglx Remove CVS keywords. 2008-09-21 11:00:44 -07:00
objviewer progs: Ignore derived files. 2010-01-01 12:16:19 +00:00
openvg progs: Check the number of configs returned by eglChooseConfig. 2010-01-12 10:55:35 +08:00
osdemos progs/osmes: add missing libGL dependency, remove unneeded lines 2009-12-21 13:37:11 -07:00
perf scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00
rbug Merge branch 'mesa_7_7_branch' 2010-01-04 19:16:24 -07:00
redbook scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00
samples Merge branch 'mesa_7_7_branch' 2010-01-04 19:16:24 -07:00
slang progs/slang: Check for ftell failure in vstest.c. 2009-11-20 11:34:21 -08:00
tests Merge branch 'mesa_7_7_branch' 2010-01-04 19:16:24 -07:00
tools/trace fix gltrace (bug 16691) 2008-07-14 08:50:36 -06:00
trivial scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00
util Merge branch 'mesa_7_6_branch' into mesa_7_7_branch 2009-12-27 15:31:08 -07:00
vp Merge branch 'mesa_7_7_branch' 2010-01-04 19:16:24 -07:00
vpglsl scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00
wgl scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00
windml Remove CVS keywords. 2008-09-21 11:00:44 -07:00
xdemos Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa 2010-01-11 15:23:29 -05:00
.gitignore progs: Ignore Mac OS dSYM directories. 2009-12-02 15:22:34 -08:00
Makefile Simplify hackery added to fix AIX build. 2009-12-01 10:27:27 -08:00
SConscript scons: Build progs together with everything else. 2010-01-01 12:16:19 +00:00