merge fix for tempo branch
authorBen Loftis <ben@harrisonconsoles.com>
Tue, 21 Apr 2015 13:35:20 +0000 (08:35 -0500)
committerBen Loftis <ben@harrisonconsoles.com>
Tue, 21 Apr 2015 13:35:20 +0000 (08:35 -0500)
commit91fac4c96dc6210dcc056da70dc608700d7eb570
tree93c24f138224d39975e6da4abaa4b36a521b970b
parentf44e2e55fdd6e4d265f3eff715b071a27da8b5eb
parentd3d7428a189d031739f901472f016b2907752640
merge fix for tempo branch
13 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/audio_clock.cc
gtk2_ardour/audio_clock.h
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_rulers.cc
gtk2_ardour/public_editor.h
gtk2_ardour/tempo_dialog.cc
libs/ardour/ardour/tempo.h
libs/ardour/tempo.cc
libs/backends/wavesaudio/waves_audiobackend.midi.cc