Avans/MusicPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
This commit is contained in:
kennyboy55
2015-11-02 22:02:59 +01:00
parent e7eba01ac7 8e64b6e5b6
commit d4b916137b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MusicPlayer/MusicPlayer/MainForm.Designer.cs
Generated
+1 -1
View File
@@ -846,7 +846,7 @@ namespace MusicPlayer
this.NotifyMenuStripPreviousButton.Click += new System.EventHandler(this.NotifyMenuStripPreviousButton_Click); this.NotifyMenuStripPreviousButton.Click += new System.EventHandler(this.NotifyMenuStripPreviousButton_Click);
// //
// resetToolStripMenuItem // resetToolStripMenuItem
// //
this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Text = "Reset";