diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:35:20 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:35:20 -0500 |
| commit | 91fac4c96dc6210dcc056da70dc608700d7eb570 (patch) | |
| tree | 93c24f138224d39975e6da4abaa4b36a521b970b /libs/backends | |
| parent | f44e2e55fdd6e4d265f3eff715b071a27da8b5eb (diff) | |
| parent | d3d7428a189d031739f901472f016b2907752640 (diff) | |
merge fix for tempo branch
Diffstat (limited to 'libs/backends')
| -rw-r--r-- | libs/backends/wavesaudio/waves_audiobackend.midi.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/backends/wavesaudio/waves_audiobackend.midi.cc b/libs/backends/wavesaudio/waves_audiobackend.midi.cc index 296f3564f9..47efd2d860 100644 --- a/libs/backends/wavesaudio/waves_audiobackend.midi.cc +++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc @@ -31,7 +31,11 @@ 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 |