]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/directmenu_options
authorterencehill <piuntn@gmail.com>
Wed, 13 Jun 2012 12:26:12 +0000 (14:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 13 Jun 2012 12:26:12 +0000 (14:26 +0200)
1  2 
qcsrc/menu/command/menu_cmd.qc

Simple merge