Merge branch 'master' into saveas
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 20 Apr 2015 19:10:41 +0000 (15:10 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 20 Apr 2015 19:10:41 +0000 (15:10 -0400)
commitced4378d0914bcfb926267772c45d1d23f3bed38
treee31875d77bf2742cd8684b3a9f02d1b2d7c98967
parent6dea7ebfb0bb66fa58b353467724a90805fb7a47
parent00f06ca9e91470f92d8f6d5ef83cbae069904f51
Merge branch 'master' into saveas

Conflicts:
gtk2_ardour/ardour.menus.in
libs/ardour/session_state.cc
gtk2_ardour/ardour.menus.in
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_ed.cc
libs/ardour/ardour/session.h
libs/ardour/session_state.cc