Merge branch 'master' into replay

This commit is contained in:
Dan Balasescu
2017-03-07 11:41:16 +09:00
committed by GitHub
18 changed files with 137 additions and 49 deletions

View File

@ -19,8 +19,6 @@ namespace osu.Desktop
{
private VersionManager versionManager;
public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
public OsuGameDesktop(string[] args = null)
: base(args)
{
@ -46,7 +44,7 @@ namespace osu.Desktop
if (desktopWindow != null)
{
desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
desktopWindow.Title = @"osu!lazer";
desktopWindow.Title = Name;
desktopWindow.DragEnter += dragEnter;
desktopWindow.DragDrop += dragDrop;