Commit Graph
10 Commits
Author SHA1 Message Date
Amadeus Folego edebf5d7da Refactor loading song errors notification 2015-01-13 00:18:36 -02:00
Lukas W 23e0e0fb8e Merge branch 'master' into ed_refac
Conflicts:
	include/AutomationEditor.h
	include/SongEditor.h
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	src/gui/editors/AutomationEditor.cpp
	src/gui/editors/BBEditor.cpp
	src/gui/editors/PianoRoll.cpp
2015-01-06 23:05:13 +01:00
Dave French 8529f6a0a4 Added Export between loop markers as a checkbox, to the Export Project dialog 2014-12-22 20:55:09 +00:00
Dave French 8f12d483a7 Render between loop markers 2014-12-21 19:59:29 +00:00
Lukas W 7c508f7900 Merge master into ed_refac 2014-12-09 00:20:28 +01:00
Lukas W 51f59293ce Rename Timeline to TimeLineWidget 2014-12-08 23:38:38 +01:00
Lukas W ed8e30b4ee Small const fix 2014-12-08 20:19:51 +01:00
Lukas W ac95123d41 Rename timeLine to Timeline 2014-11-26 01:18:07 +01:00
Lukas W 968909c07c Rename engine to Engine 2014-11-26 00:49:55 +01:00
Lukas W 7d0e3945e5 Rename song to Song 2014-11-26 00:44:41 +01:00