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

Browse Source

Conflicts:
	Vocaluxe/Base/CParty.cs

...

This commit is contained in:

Florian Küpper committed 2013-05-15 15:57:02 +02:00

2 parents 624ca03db0 bef0717c15

commit 300163f086

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