]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:34:27 +0000 (23:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 10 Sep 2010 21:34:27 +0000 (23:34 +0200)
commitae2d59dfe66fa0b479cc9f513b72a2499aab36bd
treee01f2054ba037041f26dd359f98087797425e95e
parent898ec1745ef1d81e7fa083ec7fdd5e1f9bfd7a09
parenteb71bbf8fe6bb1fbb2f5836e880e29f3eccd5775
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

Conflicts:
data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
data/font-nimbussansl.pk3dir/font-nimbussansl.cfg