Merge branch 'tzork/ents-onoff' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000 (17:43 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000 (17:43 +0200)
commitfb839150d0cd4c4937d183b723b6cc1ed250c66a
tree08d603cf34befc5876fd4798077659e6e822d4bd
parentbc51fd3d6308269b5ad770ef62b23fe98ee2cfe1
parenta39b472a953302c28fc9078da57f149881edd0e4
Merge branch 'tzork/ents-onoff' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/ents-onoff