Merge remote branch 'refs/remotes/origin/mookow/shaderlist'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:24:59 +0000 (22:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 31 Aug 2010 20:24:59 +0000 (22:24 +0200)
commit7b21d30c173adf87a39e99c2c15a2b949a3f91f0
tree3cb0f242ee481ad586e81f2af5910d28a92510b4
parentfc61ce48603c3311622c155c282096e404180d78
parent2d618f1fdb24faaf35f1f16683d20294a6956abb
Merge remote branch 'refs/remotes/origin/mookow/shaderlist'