Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...
authorMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
commit0ddfcc57044a577382568deedacd60ed3af4e97f
treea08122d041a8c11cb56cde2e78ab86c3a61ebd15
parentfbd7942a8f6255b0bf284f289b1687e35f6bef72
parenta4c63b16df9fe5bc595fc4b926032944e363a694
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent/courtfun2
scripts/shaderlist.txt