Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Fri, 13 Sep 2013 15:55:56 +0000 (11:55 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Fri, 13 Sep 2013 15:55:56 +0000 (11:55 -0400)
commit4861eca97483128e5febb575b94688581abb0154
tree9893912806d7267a0086a94d4065d32663fe157b
parentc985a64d5851634a77bc013a7f66ef8d9ccefcae
parent83a826095deaddb90b8236a757c384aa6f120e71
Merge branch 'master' into windows
gtk2_ardour/ardour_ui.cc
gtk2_ardour/editor_videotimeline.cc
gtk2_ardour/export_video_dialog.cc
gtk2_ardour/utils.cc
libs/ardour/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/port.cc
libs/ardour/session.cc
libs/ardour/session_state.cc