mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
8b20118026
This attempts to rectify the differences between versions of JFAudiolib created after we forked the code, and the extra features contained in Nuke.YKT's fork of our version. git-svn-id: https://svn.eduke32.com/eduke32@8216 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # GNUmakefile # platform/Windows/audiolib.vcxproj # platform/Windows/audiolib.vcxproj.filters # platform/Windows/eduke32.vcxproj # platform/Windows/eduke32.vcxproj.filters # source/audiolib/include/fx_man.h # source/audiolib/include/multivoc.h # source/audiolib/src/flac.cpp # source/audiolib/src/formats.cpp # source/audiolib/src/fx_man.cpp # source/audiolib/src/vorbis.cpp # source/audiolib/src/xa.cpp # source/audiolib/src/xmp.cpp # source/duke3d/src/sounds_mapster32.cpp # Conflicts: # Common.mak # GNUmakefile # platform/Windows/audiolib.vcxproj # platform/Windows/audiolib.vcxproj.filters # platform/Windows/eduke32.vcxproj # platform/Windows/eduke32.vcxproj.filters # source/audiolib/include/multivoc.h # source/audiolib/src/vorbis.cpp # source/duke3d/src/config.cpp # source/duke3d/src/game.h # source/duke3d/src/osdcmds.cpp # source/duke3d/src/sounds_mapster32.cpp |
||
---|---|---|
.. | ||
include | ||
src | ||
gpl-2.0.txt |