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)
commit60f5e26be58f996cf0262de7dd92be8166e11af8
treec55afca7d030b05e0ae9d9c0d47eb187d76ffbf6
parent2135a7ae118ee1ecd98a0e75683a9b2329bd7e70
parent76d3febbda6d7211be82d4535b4c81a96dae55a5
Merge branch 'master' into samual/serverlist
qcsrc/dpdefs/menudefs.qc
qcsrc/menu/menu.qc