Hyunjin Song 231a8407e8 Merge branch 'stable-1.2' ...

# Conflicts:
#	.travis.yml
#	.travis/linux..script.sh
#	.travis/linux.win32.script.sh
#	.travis/linux.win64.script.sh
#	.travis/osx..install.sh
#	.travis/osx..script.sh
#	data/locale/en.ts
#	data/locale/id.ts
#	include/Graph.h
#	include/VstSyncController.h
#	include/lmms_math.h
#	plugins/vst_base/RemoteVstPlugin.cpp
#	src/core/RemotePlugin.cpp
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/SubWindow.cpp
#	src/gui/widgets/Graph.cpp

2019-02-24 20:45:52 +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'

2019-02-24 20:45:52 +09:00

MidiImport.h

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

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