Lukas W 8b9868e0e5 Merge branch 'cmake_dist' ...

# Conflicts:
#	src/gui/FileBrowser.cpp

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

..

core

Merge branch 'cmake_dist'

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

gui

Merge branch 'cmake_dist'

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

tracks

Merge branch 'master' into cmake_dist

2015-05-30 22:59:06 +02:00

CMakeLists.txt

Fixed path to FLTK DLL

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