Merge branch 'stable-1.2'

# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp
This commit is contained in:
Hyunjin Song
2018-10-29 16:20:58 +09:00
76 changed files with 989 additions and 3528 deletions

View File

@@ -285,7 +285,6 @@ void SampleBuffer::update( bool _keep_settings )
else
{
fprintf( stderr, "%s\n", message.toUtf8().constData() );
exit( EXIT_FAILURE );
}
}
}