Merge branch 'stable-1.1'

Conflicts:
	include/Plugin.h
	src/core/Plugin.cpp
This commit is contained in:
Vesa committed 2014-09-02 16:59:04 +03:00
commit c2d7cf787e
126 files changed
+2422 -1061

No files matched your search

@@ -28,6 +28,7 @@
#include "dynamics_processor_controls.h"
#include "dynamics_processor.h"
#include "base64.h"
#include "graph.h"
#include "engine.h"
#include "song.h"