Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sat, 11 Sep 2010 00:23:55 +0000 (02:23 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 11 Sep 2010 00:23:55 +0000 (02:23 +0200)
commit384844611417877563bacf070ad8fd10acc4a1e6
treec0aeff043fa1096e94d6b19291c51a612c7b389c
parent6e84b60868baa6425d95cebe18e278acedb84760
parentb178fa7184625af826363539747476048ef7e63d
Merge branch 'master' of ssh://git.xonotic.org/xonotic