smoogipoo cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline ... # Conflicts: # osu.Game/osu.Game.csproj		2017-10-09 18:10:52 +09:00
..
Audio
Beatmaps	Merge remote-tracking branch 'origin/master' into editor-waveform	2017-10-09 17:20:24 +09:00
Configuration
Database
Graphics	Add ScreenSelectionTabControl to EditorMenuBar	2017-09-27 22:01:53 +09:00
Input
IO
IPC
Online	Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll	2017-09-28 00:14:04 +08:00
Overlays	Show mapper's profile when clicking on avatar in BeatmapSetOverlay	2017-09-30 05:41:32 +03:00
Properties
Resources
Rulesets	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-10-03 01:34:42 +03:00
Screens	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-09 18:10:52 +09:00
Storyboards
Tests	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-09 18:10:52 +09:00
Users
app.config
lazer.ico
OpenTK.dll.config
osu!.res
osu.Game.csproj	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-09 18:10:52 +09:00
osu.nuspec
OsuGame.cs	Show mapper's profile when clicking on avatar in BeatmapSetOverlay	2017-09-30 05:41:32 +03:00
OsuGameBase.cs
OsuGameDesktop.cs
OsuTestBrowser.cs
packages.config
Program.cs