Lukas W
422fbbc8d3
Merge branch 'master' into cmake_dist
# Conflicts:
# include/ConfigManager.h
# include/Engine.h
# plugins/CMakeLists.txt
# plugins/vst_base/CMakeLists.txt
# plugins/vst_base/Win64/CMakeLists.txt
# src/core/Engine.cpp
2015-05-30 22:59:06 +02:00
..
2015-01-29 16:37:10 +01:00
2015-01-29 16:37:10 +01:00
2015-01-29 16:37:10 +01:00
2015-05-30 22:59:06 +02:00
2015-03-21 11:53:00 +01:00
2015-01-29 13:48:52 +01:00
2015-01-09 20:17:07 +01:00
2014-11-26 10:09:49 +01:00
2014-11-10 19:26:59 +01:00
2014-11-04 22:56:50 +01:00
2015-01-13 00:18:36 -02:00
2014-11-18 13:58:38 +02:00
2014-11-26 00:52:25 +01:00
2014-11-26 01:12:22 +01:00
2014-02-23 15:23:57 +01:00