fix merge conflicts with master

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/generic_pluginui.cc
Simple merge

diff --cc gtk2_ardour/main.cc
index da2677b296b4672e76e76fa3623ff5457989d6f5,d01bca2a624f0cd57dbaa2870d867a369847cb64..70472e7f7eae0f2b81b3e104f2d83fee5c85833a
--- 1/gtk2_ardour/main.cc
--- 2/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@@ -173,10 -172,10 +173,10 @@@ fixup_bundle_environment (int, char* []
        export_search_path (bundle_dir, "ARDOUR_INSTANT_XML_PATH", "/Resources");
        export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins");
        export_search_path (bundle_dir, "VAMP_PATH", "/lib");
-       export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
        export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
  
-       g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
 -      setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
 -      setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(getenv ("PATH"))).c_str(), 1);
++      g_setenv ("SUIL_MODULE_DIR", (bundle_dir + "/lib").c_str(), 1);
++      g_setenv ("PATH", (bundle_dir + "/MacOS:" + std::string(g_getenv ("PATH"))).c_str(), 1);
  
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
@@@ -283,10 -282,10 +283,10 @@@ fixup_bundle_environment (int /*argc*/
        export_search_path (dir_path, "ARDOUR_DATA_PATH", "/share");
        export_search_path (dir_path, "LADSPA_PATH", "/plugins");
        export_search_path (dir_path, "VAMP_PATH", "/lib");
-       export_search_path (dir_path, "SUIL_MODULE_DIR", "/lib");
        export_search_path (dir_path, "GTK_PATH", "/lib/gtkengines");
  
-       g_setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
 -      setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
 -      setenv ("PATH", (dir_path + "/bin:" + std::string(getenv ("PATH"))).c_str(), 1);
++      g_setenv ("SUIL_MODULE_DIR", (dir_path + "/lib").c_str(), 1);
++      g_setenv ("PATH", (dir_path + "/bin:" + std::string(g_getenv ("PATH"))).c_str(), 1);
  
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */

diff --cc gtk2_ardour/port_matrix.cc
Simple merge

diff --cc gtk2_ardour/route_ui.cc
Simple merge

diff --cc libs/ardour/ardour/session.h
Simple merge

diff --cc libs/ardour/audioengine.cc
Simple merge

diff --cc libs/ardour/lv2_plugin.cc
Simple merge

diff --cc libs/ardour/route.cc
Simple merge

diff --cc libs/ardour/session.cc
Simple merge

diff --cc libs/ardour/session_state.cc
Simple merge

diff --cc libs/ardour/wscript
Simple merge

diff --cc wscript
index 70b41d5a691fe9192b2c3e18fbc386f19cc99558,3d016326d5901266d80d06817483f08dd318d675..00d3748e87e78d5f4f9ca199e6e7629aa1a8076d
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -33,7 -33,9 +33,8 @@@ children = 
          'libs/timecode',
          'libs/ardour',
          'libs/gtkmm2ext',
 -        'libs/clearlooks-newer',
          'libs/audiographer',
+         'libs/plugins/reasonablesynth.lv2',
          'gtk2_ardour',
          'export',
          'midi_maps',