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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files