Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:27:55 +0000 (13:27 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:27:55 +0000 (13:27 +1000)
commit853b6160a59c1e6f1b67af9abd43cf98d25b8625
tree7ddfd5eb50391f3e55029f14bf78df1bdc39808a
parentf79df07eb1f6be7a844e29e4a44431ce20483bec
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/maplist.qc