]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
projects / xonotic / darkplaces.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 4c32ad6) | patch
UNMERGE
authorhavoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Mon, 5 Jul 2010 08:30:22 +0000 (08:30 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:00:49 +0000 (22:00 +0200)
commit3ce78f36002bf316174776bb88c4aa9d814adce2
treeda4b36f31cfa50422bb66c209966d10d84d62f95tree | snapshot
parent4c32ad64cf14220f8c3302a08f270712678e3b19commit | diff
UNMERGE
remove the #define list at the start of the embedded default.glsl, it
was unintended (this list is prepended by r_glsl_dumpshader)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10274 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=5f3f4500441e25bb570136717e29e79327685778
gl_rmain.c diff | blob | history