smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts with master

Browse source
This commit is contained in:
Paul Davis 2013-09-14 16:42:40 -04:00
commit 7a30e63eaa
213 changed files with 29641 additions and 21838 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/generic_pluginui.cc
View file

@ -37,8 +37,6 @@
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/slider_controller.h>
#include "midi++/manager.h"
#include "ardour/plugin.h"
#include "ardour/plugin_insert.h"
#include "ardour/session.h"