resolve merge with master (?)
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 26 Nov 2013 15:24:51 +0000 (10:24 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 26 Nov 2013 15:24:51 +0000 (10:24 -0500)
commit08371ae2cf6231bbb8522645d14add41ffa9c1c0
tree5a3e1efc54a669336f6047ff23d7323eac26f287
parentd135c4dc3a307d0be606f3afbbc8fd8c3ec56438
parent8c2cc85e8fd1ac55761c2f53aebbe98b8f22a40a
resolve merge with master (?)
16 files changed:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_dialogs.cc
gtk2_ardour/editor_markers.cc
gtk2_ardour/editor_timefx.cc
gtk2_ardour/wscript
libs/ardour/ardour/session.h
libs/ardour/audioengine.cc
libs/ardour/midi_ui.cc
libs/ardour/session.cc
libs/ardour/vst_plugin.cc
libs/ardour/wscript
libs/backends/jack/jack_utils.cc
libs/evoral/src/libsmf/smf_load.c
libs/taglib/wscript
wscript