Merge branch 'master' into divVerent/german-translation
authorRudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 17 Jan 2011 12:19:39 +0000 (13:19 +0100)
commit7f991322e66aa699880b24d1c8e59d3f2f1c7754
treea8d033f44b537c61e591546a566c899e7bf13670
parent32c412e70971f08ff54cd8082319160fb8ebfb4d
parent9c405d459f5a0510e002592f83a280a82ffaf5dc
Merge branch 'master' into divVerent/german-translation
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c