]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:23:58 +0000 (11:23 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:23:58 +0000 (11:23 +0100)
commit0472de4ce3dd2a27b13ea9790ff8c2b21f89fd9d
treeef2da92ff0a4f785d8afef79a523df5b61513b2c
parentba8f6aed069f134da65051b999f11dce63c9fc8b
parent869d61da2f43f4183d1dd6e6924c47220de355c1
Merge branch 'master' into divVerent/opera-by-morphed
scripts/shaderlist.txt