Hyunjin Song 4252f755c2 Merge branch 'stable-1.2' ...

# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp

2018-10-29 16:20:58 +09:00

..

classic

Merge branch 'stable-1.2'

2018-10-29 16:20:58 +09:00

default

Merge branch 'stable-1.2'

2018-10-29 16:20:58 +09:00

CMakeLists.txt

migrated build-system to CMAKE

2008-07-22 11:36:50 +00:00