From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 9 May 2016 21:03:59 +0000 (+0000)
Subject: Merge branch 'terencehill/menu_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~932
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a823548db666d01ecf1ef8b8e559caa61334ce26;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/menu_fixes' into 'master'

Misc minor fixes to the menu



See merge request !316
---

a823548db666d01ecf1ef8b8e559caa61334ce26
diff --cc qcsrc/menu/xonotic/cvarlist.qc
index f23af46d9,18f439d54..12bb2810b
--- a/qcsrc/menu/xonotic/cvarlist.qc
+++ b/qcsrc/menu/xonotic/cvarlist.qc
@@@ -1,8 -1,8 +1,9 @@@
  #include "cvarlist.qh"
  
  #include "inputbox.qh"
+ #include "../item/checkbox.qh"
  #include "../item/container.qh"
 +#include "../item/checkbox.qh"
  
  entity makeXonoticCvarList()
  {