Merge remote-tracking branch 'origin/master' into terencehill/directmenu_options
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:57:22 +0000 (16:57 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:57:22 +0000 (16:57 -0500)
1  2 
qcsrc/menu/command/menu_cmd.qc

Simple merge