merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 14 Jun 2013 03:00:24 +0000 (23:00 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 14 Jun 2013 03:00:24 +0000 (23:00 -0400)
commitf00b3b7f111e36537d773daef0ae77b03d11f82f
tree4bfdd432199a7d4a4cbfc7769493e6bedaa5e51f
parent31d234b48c36bddb4d5228a3abee9c4419403879
parent80a13145f398e1c4ea22b3f8a25a5b38d3c5e328
merge with master
14 files changed:
gtk2_ardour/editor.h
gtk2_ardour/editor_actions.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/public_editor.h
gtk2_ardour/route_time_axis.cc
gtk2_ardour/utils.cc
gtk2_ardour/utils.h
gtk2_ardour/video_monitor.cc
gtk2_ardour/video_timeline.cc
gtk2_ardour/video_timeline.h
gtk2_ardour/wscript
libs/ardour/wscript
wscript