Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Wed, 26 Jun 2013 02:24:47 +0000 (22:24 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 26 Jun 2013 02:24:47 +0000 (22:24 -0400)
commit3031a99364333b9adcc52c4922687477a1e62337
tree226d75d493f0a7444aaea534a5d8e18020ccf095
parent2b74c955f1e10896cc28c3937b884ad4723c0476
parent4a7c615714691984009a9fc05ebaeaceb335b641
Merge branch 'master' into cairocanvas
gtk2_ardour/ardev_common.sh.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor.cc
gtk2_ardour/editor_canvas_events.cc
gtk2_ardour/editor_summary.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/gain_meter.cc
gtk2_ardour/time_axis_view.cc
wscript