merge fix for tempo branch

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/ardour_ui.h
Simple merge

diff --cc gtk2_ardour/audio_clock.cc
Simple merge

diff --cc gtk2_ardour/audio_clock.h
Simple merge

diff --cc gtk2_ardour/editor.cc
Simple merge

diff --cc gtk2_ardour/editor.h
index 7cfc6ff9ffd35886ca39bec9dcd71995d76ba7e2,fd090edee10150c5839f3d7361a032fe87720a17..9f37f9d1f23df493f226ae3cf99ef06857b2f275
--- 1/gtk2_ardour/editor.h
--- 2/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@@ -365,8 -363,8 +365,9 @@@ class Editor : public PublicEditor, pub
  
        void scroll_tracks_down_line ();
        void scroll_tracks_up_line ();
-         bool scroll_up_one_track (bool skip_child_views = false);
-         bool scroll_down_one_track (bool skip_child_views = false);
 -      bool scroll_up_one_track ();
 -      bool scroll_down_one_track ();
++      
++      bool scroll_up_one_track (bool skip_child_views = false);
++      bool scroll_down_one_track (bool skip_child_views = false);
  
        void prepare_for_cleanup ();
        void finish_cleanup ();

diff --cc gtk2_ardour/editor_markers.cc
Simple merge

diff --cc gtk2_ardour/editor_rulers.cc
Simple merge

diff --cc gtk2_ardour/public_editor.h
Simple merge

diff --cc gtk2_ardour/tempo_dialog.cc
Simple merge

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

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

diff --cc libs/backends/wavesaudio/waves_audiobackend.midi.cc
index 296f3564f9d4a8bb870fda2f8bf475dafbe7f489,0fa88e9df390832784523471add88ff64bff9f71..47efd2d8601ff798ec0b2dd73271e0989b768ece
--- 1/libs/backends/wavesaudio/waves_audiobackend.midi.cc
--- 2/libs/backends/wavesaudio/waves_audiobackend.midi.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
@@@ -31,7 -31,7 +31,11 @@@ const std::vector<std::string> WavesAud
  
  #elif PLATFORM_WINDOWS
  
++<<<<<<< HEAD
 +const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("System MIDI (MME)") ("None");
++=======
+ const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None");
++>>>>>>> remotes/origin/tempo-marker-from-clock
  
  #endif