Alexandre 3d46f8a290 Merge branch 'coding' ...

Conflicts:
	include/Note.h
	include/ProjectVersion.h
	include/TimeLineWidget.h
	include/Track.h
	src/core/Plugin.cpp
	src/core/ProjectVersion.cpp
	src/core/Song.cpp
	src/core/Track.cpp
	src/gui/TimeLineWidget.cpp

2015-03-01 12:55:58 -03:00

4.0 KiB

Raw Blame History

View Raw