Merge branch 'master' into samual/serverlist
authorRudolf Polzer <divverent@xonotic.org>
Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 13 Oct 2013 22:50:32 +0000 (00:50 +0200)
1  2 
qcsrc/dpdefs/menudefs.qc
qcsrc/menu/menu.qc

Simple merge
Simple merge