Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 11:26:07 +0000 (13:26 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 17 Jun 2012 11:26:07 +0000 (13:26 +0200)
commit42df301d6e114c923c5e5d0e3059de91b4666bb7
tree0adc4a00fc1237711c7219fa3764d64ec367fa39
parentb186e36be65d9d9c15f5aa496a7cff13ec487225
parentb79f47701b5da225338fbdeb02ae982f7edfd4e4
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir