]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 10:09:15 +0000 (12:09 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 10:09:15 +0000 (12:09 +0200)
1  2 
qcsrc/server/w_crylink.qc

Simple merge