GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitesp...
commit8d28883c065a8f172ac04b6c7160fa3ee452d62f
authorpaul <paul@d708f5d6-7413-0410-9779-e7cbd77b26cf>
Mon, 21 Jun 2010 14:46:17 +0000 (21 14:46 +0000)
committerpaul <paul@d708f5d6-7413-0410-9779-e7cbd77b26cf>
Mon, 21 Jun 2010 14:46:17 +0000 (21 14:46 +0000)
treeffbf90ffbe43d1e9fde4f08084ab99fbdd99e4e1
parenta921751d0baa2b080c0ed7c5ed0f2492e230756f
GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitespace reformatting for some reason

git-svn-id: http://subversion.ardour.org/svn/ardour2/ardour2/branches/3.0@7284 d708f5d6-7413-0410-9779-e7cbd77b26cf
gtk2_ardour/session_option_editor.cc
libs/ardour/ardour/session_configuration_vars.h
libs/ardour/ardour/types.h
libs/ardour/enums.cc
libs/ardour/midi_model.cc