fix cherry-pick conflict

This commit is contained in:
Paul Davis 2015-12-11 11:05:57 -05:00
parent e302ce8662
commit 8ba8f1c0b0
7 changed files with 370 additions and 91 deletions

View file

@ -205,6 +205,7 @@ public:
int connection_state;
MidiByteArray display_line (std::string const& msg, int line_num);
bool update_subview_mode_display ();
public:
/* IP MIDI devices need to keep a handle on this and destroy it */