Hyunjin Song 044c88c271 Merge branch 'stable-1.2' ...

# Conflicts:
#	.gitmodules
#	.travis.yml
#	.travis/linux..before_install.sh
#	.travis/linux..install.sh
#	CMakeLists.txt
#	cmake/linux/package_linux.sh.in
#	cmake/modules/BuildPlugin.cmake
#	include/AutomatableModel.h
#	plugins/MidiImport/MidiImport.cpp
#	plugins/carlapatchbay/CMakeLists.txt
#	plugins/carlarack/CMakeLists.txt
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/editors/SongEditor.cpp
#	tests/src/core/AutomatableModelTest.cpp

2020-04-04 12:08:55 +09:00

..

portsmf

Don't memcpy null pointer

2019-01-19 16:29:15 +00:00

CMakeLists.txt

Fix moc_file inclusion in cmake files

2014-11-21 07:16:45 +01:00

MidiImport.cpp

Merge branch 'stable-1.2'

2020-04-04 12:08:55 +09:00

MidiImport.h

update all copyright headers to the proper url (#3326)

2017-02-06 02:41:15 +02:00