Files
lmms/include/TimeLineWidget.h
Jonas Trappenberg 76ffbd6528 Merge branch 'master' into coding
Conflicts:
	include/Plugin.h
	src/core/Note.cpp
	src/core/Track.cpp
2015-01-31 19:11:33 -08:00

4.0 KiB