Lukas W 44f8b24fb3 Merge branch 'stable-1.1' ...

# Conflicts:
#	include/PianoRoll.h
#	src/gui/editors/PianoRoll.cpp

2015-06-15 10:11:53 +02:00

..

core

Merge branch 'cmake_dist'

2015-06-14 21:38:12 +02:00

gui

Merge branch 'stable-1.1'

2015-06-15 10:11:53 +02:00

tracks

Merge branch 'stable-1.1'

2015-06-15 10:11:53 +02:00

CMakeLists.txt

Fixed path to FLTK DLL

2015-02-15 20:05:00 +01:00