Merge branch 'stable-1.1'

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

View File

@@ -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"