fix conflicts and merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 Sep 2013 02:11:06 +0000 (22:11 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 Sep 2013 02:11:06 +0000 (22:11 -0400)
commitfb45fdc052b23f4b2210c71a03a14bdb5986098a
treeb61c6331bc7699669834600c09dcf1dc3dccd109
parent0da34e65e3470b1c2298ddf571df6356d0d42bd8
parentc8b32e2f8bed225b8f5ceac130eea6632f595492
fix conflicts and merge with master
gtk2_ardour/ardour_ui.cc
gtk2_ardour/utils.cc
libs/ardour/ardour/session.h
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/surfaces/wscript