Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_create.qc
Simple merge

diff --cc qcsrc/menu/xonotic/maplist.qc
index e06c3084c34a3696318be1661b0474ff79c46dba,ec9aa1f4c7bc104216e3329d0d4c710e88c4e95b..f7da843621a2dff999e2fc153391982e06a1ccf8
--- 1/qcsrc/menu/xonotic/maplist.qc
--- 2/qcsrc/menu/xonotic/maplist.qc
+++ b/qcsrc/menu/xonotic/maplist.qc
@@@ -43,15 -42,11 +45,15 @@@ CLASS(XonoticMapList, XonoticListBox
  
        METHOD(XonoticMapList, destroy, void(entity))
  
-       ATTRIB(XonoticListBox, alphaBG, float, 0)
+       ATTRIB(XonoticMapList, alphaBG, float, 0)
  ENDCLASS(XonoticMapList)
  entity makeXonoticMapList();
 -void MapList_All(entity btn, entity me);
 -void MapList_None(entity btn, entity me);
 +entity makeXonoticMapListStringFilterBox(entity me, float doEditColorCodes, string theCvar);
 +void MapList_StringFilterBox_Change(entity box, entity me);
 +float MapList_StringFilterBox_keyDown(entity me, float key, float ascii, float shift);
 +void MapList_Add_Shown(entity btn, entity me);
 +void MapList_Remove_Shown(entity btn, entity me);
 +void MapList_Remove_All(entity btn, entity me);
  void MapList_LoadMap(entity btn, entity me);
  #endif