Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/flokuep/release-0.3' into develop

Browse Source 
Conflicts:
	Vocaluxe/Base/CDataBase.cs
This commit is contained in:
Flamefire committed 2013-08-22 00:43:53 +02:00
2 parents 44c78fad19 fb9476d1cf
commit cd826bdafd
20 files changed
+267 -126
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Songs/CSongNote.cs
+2 -7
View File
@@ -12,16 +12,11 @@
Text = note.Text;
}
public CSongNote(int startBeat, int duration, int tone, string text) : base(startBeat, duration, tone)
{
NoteType = ENoteType.Normal;
Text = text;
}
public CSongNote(int startBeat, int duration, int tone, string text, ENoteType noteType)
: this(startBeat, duration, tone, text)
: base(startBeat, duration, tone)
{
NoteType = noteType;
Text = text;
}
#endregion Constructors