Merge remote-tracking branch 'origin/developer' into developer

Conflicts: MusicPlayer/MusicPlayer/MainForm.Designer.cs
2015-11-02 22:02:59 +01:00
parent e7eba01ac7 8e64b6e5b6
commit d4b916137b
1 changed files with 1 additions and 1 deletions
@@ -846,7 +846,7 @@ namespace MusicPlayer
            this.NotifyMenuStripPreviousButton.Click += new System.EventHandler(this.NotifyMenuStripPreviousButton_Click);
            //
            // resetToolStripMenuItem
-            // 
+            //
            this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
            this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
            this.resetToolStripMenuItem.Text = "Reset";