resolve merge with master (?)

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/ardour_ui_dialogs.cc
Simple merge

diff --cc gtk2_ardour/editor_markers.cc
Simple merge

diff --cc gtk2_ardour/editor_timefx.cc
Simple merge

diff --cc gtk2_ardour/wscript
index 58a43022322b345be197f8f69c3f7f9943edfc80,3ca90744c7c5fb7aa190e515d5dae1a3d0fafa7b..a4ec9deee8ed356ae3e3725c18a8fd42b183e270
--- 1/gtk2_ardour/wscript
--- 2/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@@ -416,14 -417,13 +418,20 @@@ def build(bld)
      obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '
      obj.use          = [ 'libpbd',
                           'libmidipp',
-                          'libtaglib',
                           'ardour',
                           'libardour_cp',
 -                         'libgtkmm2ext']
 +                         'libgtkmm2ext',
-                          'libtaglib' ]
++                         ]
++
 +    if bld.env['build_target'] == 'mingw':
 +      if bld.env['DEBUG'] == False:
 +            obj.linkflags = ['-mwindows']
++
+     if bld.is_defined('USE_EXTERNAL_LIBS'):
+         obj.uselib += ' TAGLIB'
+     else:
+         obj.use.append('libtaglib')
++
      if sys.platform == 'darwin':
          obj.use += ' libappleutility'
      obj.defines     = [

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

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

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

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

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

diff --cc libs/ardour/wscript
Simple merge

diff --cc libs/backends/jack/jack_utils.cc
Simple merge

diff --cc libs/evoral/src/libsmf/smf_load.c
Simple merge

diff --cc libs/taglib/wscript
Simple merge

diff --cc wscript
Simple merge