merge with master.
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 1 Jul 2014 13:46:18 +0000 (09:46 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 1 Jul 2014 13:46:18 +0000 (09:46 -0400)
commit23e7cf10191270d70357ccf0ed9294f020c7b7ab
treeddc1fc4d1914fe3de3de79c194c5dd859915bd2a
parent4244ea65460b865f946551aace9b74191b26be4b
parentb660bc8ae92d19aedf0165815432b77a0c6170c4
merge with master.

Manually resolved conflicts in import.cc and session.cc
13 files changed:
gtk2_ardour/editor.h
gtk2_ardour/editor_audio_import.cc
libs/ardour/ardour/file_source.h
libs/ardour/ardour/session.h
libs/ardour/ardour/smf_source.h
libs/ardour/audiofilesource.cc
libs/ardour/diskstream.cc
libs/ardour/file_source.cc
libs/ardour/import.cc
libs/ardour/midi_diskstream.cc
libs/ardour/session.cc
libs/ardour/session_state.cc
libs/ardour/smf_source.cc