fix merge with master
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 11 Jan 2014 20:19:18 +0000 (15:19 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 11 Jan 2014 20:19:18 +0000 (15:19 -0500)
commit59631acc5f41153a294c97ab820a4b41a886e24c
tree1e1b4fe2b2008eb790d1ffc0dcb5945c4b143c2f
parent943bcc29cc05bc1d75df505cd259659a72dc56b1
parent72d8ca89e2f4b2e194b2bbd99261deb5b2108a40
fix merge with master
gtk2_ardour/automation_line.cc
gtk2_ardour/automation_line.h
libs/ardour/ardour/midi_patch_manager.h
libs/midi++2/midi++/midnam_patch.h
libs/midi++2/midnam_patch.cc