Inicio Explorar Axuda
Rexistro Iniciar sesión
Avans-TI
/
2.1-MusicStreamer-YJMPD
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

Conflicts:
	MusicPlayer/MusicPlayer/MainForm.Designer.cs
Kenneth van Ewijk %!s(int64=10) %!d(string=hai) anos
pai
e7eba01ac7 8e64b6e5b6
achega
d4b916137b
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      MusicPlayer/MusicPlayer/MainForm.Designer.cs

+ 1 - 1
MusicPlayer/MusicPlayer/MainForm.Designer.cs
Ver ficheiro 

@@ -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";