Merge branch 'master' into terencehill/menu_dialogs_cleanups

author terencehill <piuntn@gmail.com>

Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)

committer terencehill <piuntn@gmail.com>

Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
author terencehill <piuntn@gmail.com>
Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
committer terencehill <piuntn@gmail.com>
Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
diff --cc qcsrc/menu/xonotic/dialog_settings_effects.c
Simple merge
author	terencehill <piuntn@gmail.com>
	Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)
committer	terencehill <piuntn@gmail.com>
	Mon, 24 Jan 2011 21:01:25 +0000 (22:01 +0100)