Merge branch 'master' into divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:39:37 +0000 (21:39 +0200)
commit94cd32389004162a325b9e08cfb39bbae156eb0e
tree632db482dc9ee27e41159f9a1e758a4cdc9e2bb1
parentb360fb458bd90305189aeb584af2f32359c2de1d
parentf314057c5368749c358ea3122af0ef6cd56942ad
Merge branch 'master' into divVerent/desktopfullscreen

Conflicts:
qcsrc/menu/menu.qc
defaultXonotic.cfg
qcsrc/common/util-pre.qh
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/slider_resolution.c