smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

another merge fix

Browse source
This commit is contained in:
Ben Loftis 2015-04-21 08:37:54 -05:00
parent 91fac4c96d
commit 7ee9726c89
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/backends/wavesaudio/waves_audiobackend.midi.cc
View file

@ -31,11 +31,7 @@ const std::vector<std::string> WavesAudioBackend::__available_midi_options = boo
#elif PLATFORM_WINDOWS
<<<<<<< HEAD
const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("System MIDI (MME)") ("None");
=======
const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None");
>>>>>>> remotes/origin/tempo-marker-from-clock
#endif