]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 21:04:48 +0000 (23:04 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 21:04:48 +0000 (23:04 +0200)
Conflicts:
balanceXonotic.cfg

1  2 
balanceXonotic.cfg

Simple merge