You've already forked libopenshot-audio
mirror of
https://github.com/OpenShot/libopenshot-audio.git
synced 2026-03-02 08:54:01 -08:00
a303479eee
Conflicts: JuceLibraryCode/modules/juce_audio_formats/codecs/flac/all.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/alloc.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/assert.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/callback.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/compat.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/endswap.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/export.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/format.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitmath.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitreader.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/bitwriter.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/crc.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/fixed.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/float.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/format.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/all.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitmath.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitreader.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/bitwriter.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/cpu.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/crc.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/fixed.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/float.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/format.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/lpc.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/md5.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/memory.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/stream_encoder_framing.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/window.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/all.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_decoder.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/include/protected/stream_encoder.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/md5.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/memory.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder_framing.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/libFLAC/window_flac.c JuceLibraryCode/modules/juce_audio_formats/codecs/flac/metadata.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/ordinals.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/stream_decoder.h JuceLibraryCode/modules/juce_audio_formats/codecs/flac/stream_encoder.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/bitwise.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/codec.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/config_types.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/framing.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/analysis.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/backends.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/bitrate.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/bitrate.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/block.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/coupled/res_books_51.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/coupled/res_books_stereo.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/floor/floor_books.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/books/uncoupled/res_books_uncoupled.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codebook.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/codec_internal.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/envelope.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/envelope.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor0.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/floor1.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/highlevel.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/info.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lookup_data.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lpc.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lpc.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lsp.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/lsp.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mapping0.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/masking.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mdct.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/mdct.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/misc.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/floor_all.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_11.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_16.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_44.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/psych_8.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_16.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44p51.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_44u.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/residue_8.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_11.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_16.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_22.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_32.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44p51.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_44u.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_8.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/modes/setup_X.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/os.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/psy.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/psy.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/registry.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/registry.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/res0.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/scales.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/sharedbook.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/smallft.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/smallft.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/synthesis.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisenc.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/vorbisfile.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.c JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.2/lib/window.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/ogg.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/os_types.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/vorbisenc.h JuceLibraryCode/modules/juce_audio_formats/codecs/oggvorbis/vorbisfile.h
Important Note!! ================ The purpose of this folder is to contain files that are auto-generated by the Introjucer, and ALL files in this folder will be mercilessly DELETED and completely re-written whenever the Introjucer saves your project. Therefore, it's a bad idea to make any manual changes to the files in here, or to put any of your own files in here if you don't want to lose them. (Of course you may choose to add the folder's contents to your version-control system so that you can re-merge your own modifications after the Introjucer has saved its changes).