Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techa...
authorMaik Merten <maikmerten@googlemail.com>
Tue, 28 Dec 2010 16:31:51 +0000 (17:31 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Tue, 28 Dec 2010 16:31:51 +0000 (17:31 +0100)
commit51721f4c0ee108dbbfa8c069f7fcaca26ee357ba
tree2eeeb27cf6ef92757e9ae82b160db0ebae7ac1a8
parent3b910f9e2b8cd5704821a56607a3e7c3eefc3a23
parent1f225307cd68062a658a2e1cf57bb7e8837e1d7b
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techassault

Conflicts:
scripts/shaderlist.txt
scripts/shaderlist.txt