Merge branch 'divVerent/xoylent-sane-options'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000 (07:37 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000 (07:37 +0200)
commit76984288e76969c9243f4988d91f6044cb95fd61
treea2d90346a7ed3fd5ab7b91ec02cf3b658cab11ac
parent3fb02fb69b02ca33400219fbeb3bac11f09998d5
parenta80e519084adc2b5373d2266070ee64100523b49
Merge branch 'divVerent/xoylent-sane-options'