Merge branch 'master' into terencehill/menu_dialogs_cleanups
authorterencehill <piuntn@gmail.com>
Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
commit9025619c550b721820b0fd231f662a68cc398478
tree7ccc6af723e9506fc75d1d6ddf959bb4c4ee250e
parent8b5335b125ddeb8a0c023ff5cf7f5f28f034f4e3
parent5a3e059a42c4429013c67a55339a7a7d4bb250cc
Merge branch 'master' into terencehill/menu_dialogs_cleanups
qcsrc/menu/xonotic/dialog_settings_effects.c