]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/diabolik/techpanel'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:41:18 +0000 (05:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:41:18 +0000 (05:41 +0200)
1  2 
scripts/shaderlist.txt

Simple merge