Merge branch 'develop' of github.com:flokuep/Vocaluxe into develop

Browse Source

Conflicts:
	VocaluxeLib/Menu/CBackground.cs

...

This commit is contained in:

Florian Küpper committed 2013-12-19 09:04:44 +01:00

2 parents 0c807862a8 124d7d0bf4

commit 08ddb4ba63

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

Diff Content Not Available