Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Apr 2013 18:23:41 +0000 (14:23 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 9 Apr 2013 18:23:41 +0000 (14:23 -0400)
commitbca507a80811e0878f976434767bc45cd61f5ab3
tree1851b91f34fa28d754c92764fb36d1616cfd90b1
parent053eaf77fde7639d4e200d36a9db99b2d4fc615b
parent082de27a4e4b192e541c95cb90b97be67d5ed2d0
Merge branch 'master' into cairocanvas
gtk2_ardour/ardour_ui.cc
gtk2_ardour/video_timeline.cc
gtk2_ardour/video_timeline.h
wscript