]> icculus.org git repositories - divverent/darkplaces.git/commit
Merge branch 'master' into blub/shader-toys blub/shader-toys
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 26 Feb 2010 15:21:13 +0000 (16:21 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 26 Feb 2010 15:21:13 +0000 (16:21 +0100)
commit894d7b0ad9c3757281905b56476540ebd336cb79
tree696ff901666fd0ebc8f00ffddb88a60bd4a72bc3
parent66444ffed034db5d36a8bf2077334b4aa2dd85bc
parentef4adee42c844523c889cbc6c19d2da940f00ec6
Merge branch 'master' into blub/shader-toys
gl_rmain.c