Merge remote branch 'origin/terencehill/cvarlist_patch'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 22:09:23 +0000 (23:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 22:09:23 +0000 (23:09 +0100)
1  2 
qcsrc/menu/xonotic/cvarlist.c
qcsrc/menu/xonotic/dialog_settings_misc_cvars.c

Simple merge