Dean Herbert cd513e6e91 Merge branch 'master' into note-placement		2018-11-26 23:12:25 +09:00
..
Audio
Beatmaps	Fix crashes when importing/deleting from model managers	2018-11-21 23:11:09 +01:00
Configuration	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
Database
Graphics	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
Input	Use IBindable<>	2018-11-26 17:07:30 +09:00
IO	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
IPC
Migrations
Online	Merge branch 'master' into multiplayer-room-settings	2018-11-26 16:46:27 +09:00
Overlays	Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection	2018-11-26 16:12:55 +09:00
Properties
Rulesets	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Screens	Merge branch 'master' into fix_idle_tracker	2018-11-26 17:41:45 +09:00
Skinning	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
Storyboards	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
Tests	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
Users	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
Utils	Use HResult	2018-10-31 17:07:05 +09:00
osu!.res
osu.Game.csproj	Update package	2018-11-21 23:11:09 +01:00
OsuGame.cs	Remove unnecessarily specified RelativeSizeAxes	2018-11-26 16:39:11 +09:00
OsuGameBase.cs	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00