]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
UNMERGE
authorvortex vortex@d7cf8633-e32d-0410-b094-e92efae38249 <>
Tue, 22 Mar 2011 15:15:59 +0000 (15:15 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 26 Mar 2011 18:49:51 +0000 (19:49 +0100)
commit1ce5b955cc1c29b384cc48834ae2b567bcc877fb
tree55404627afad245e017eca1d03245136f3111881
parent2a3b9a17dd1c8c91b76b4c03ccbcdbc9a263a5fc
UNMERGE
GLSL shader: make dp_waterscroll work with dp_reflect and dp_refract

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10958 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=dbd8e60c7e473f960271f3f52d66382e205001db
gl_rmain.c
shader_glsl.h