Commit graph

5 commits

Author SHA1 Message Date
VKamyshniy
3c2b0d446a [Summary] Implementing behavior per request from Igor 2015-01-10 12:43:54 +02:00
Paul Davis
31d500e3a9 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
	gtk2_ardour/mixer_strip.cc
	gtk2_ardour/route_time_axis.cc
	gtk2_ardour/route_ui.h
	gtk2_ardour/ui/audio_time_axis.xml
	gtk2_ardour/ui/editor_mixer.xml
	gtk2_ardour/ui/meter_strip.xml
	gtk2_ardour/waves_button.cc
	gtk2_ardour/waves_button.h
	gtk2_ardour/waves_zoom_control.cc
	gtk2_ardour/waves_zoom_control.h
2014-08-27 12:38:27 -04:00
VKamyshniy
376b1f6975 [Summary] Implementing the wave zoom control in the transport bar 2014-08-18 18:44:19 -04:00
Paul Davis
b90f866368 fix minor issues stemming from API changes after ardour-cairocanvas merge 2014-08-18 16:30:48 -04:00
VKamyshniy
4c4daba2f0 [Summary] Implementing the wave zoom control in the transport bar 2014-08-18 16:17:11 -04:00