Dean Herbert aa96d98822 Merge branch 'master' into limit-game-access ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs osu.Game/GameModes/Menu/ButtonSystem.cs osu.Game/Online/Chat/Display/ChatLine.cs osu.Game/OsuGame.cs osu.Game/Overlays/ToolbarButton.cs		2016-10-12 20:44:33 +09:00
..
Display	Merge branch 'master' into limit-game-access	2016-10-12 20:44:33 +09:00
Channel.cs	Centralise the maximum chat history variable.	2016-10-12 15:25:07 +09:00
Message.cs	General improvements to chat querying and logic organisation.	2016-10-08 19:23:21 +09:00