diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-10-31 03:42:37 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-10-31 03:42:37 +0300 |
| commit | 634fefa614f29056e5b4dadc1e4db9ce61d49e59 (patch) | |
| tree | 1dfd49be726113898395449ae337308f138e43aa /libADLMIDI-test.pro | |
| parent | 78b48a4f7250f94b62a5c995f8c714804bb66eef (diff) | |
| parent | 24f30e137009fda5262c6465742fb997a1ef8e8f (diff) | |
| download | libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.tar.gz libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.tar.bz2 libADLMIDI-634fefa614f29056e5b4dadc1e4db9ce61d49e59.zip | |
Merge branch 'master' into seekability
# Conflicts:
# libADLMIDI-test.pro
# src/adlmidi.cpp
# src/adlmidi_private.hpp
Diffstat (limited to 'libADLMIDI-test.pro')
| -rw-r--r-- | libADLMIDI-test.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libADLMIDI-test.pro b/libADLMIDI-test.pro index 2a285d4..45313b4 100644 --- a/libADLMIDI-test.pro +++ b/libADLMIDI-test.pro @@ -31,7 +31,7 @@ HEADERS += \ src/adlmidi_xmi2mid.h \ src/fraction.h \ src/nukedopl3.h \ - #src/dbopl.h \ + src/dbopl.h \ src/midiplay/wave_writer.h SOURCES += \ @@ -45,7 +45,7 @@ SOURCES += \ src/adlmidi_private.cpp \ src/adlmidi_xmi2mid.c \ src/nukedopl3.c \ - #src/dbopl.cpp \ + src/dbopl.cpp \ utils/midiplay/adlmidiplay.cpp \ utils/midiplay/wave_writer.c |