Ignore:
Timestamp:
Apr 11, 2017, 1:49:44 AM (7 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
sampler
Children:
04d0c89
Parents:
fbafd2c (diff), b762f8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into sampler

Fixed conflicts:

python/lib/gen_external.py
src/io/source_avcodec.c

File:
1 edited

Legend:

Unmodified
Added
Removed

  • python/lib/gen_external.py

    rfbafd2c rb201912  
    3838  'source_avcodec',
    3939  'source_wavread',
    40   #'sampler',
    4140  'audio_unit',
     41  'spectral_whitening',
    4242  'timestretch', # TODO fix parsing of uint_t *read in _do
    4343  'sampler', # TODO fix parsing of uint_t *read in _do
Note: See TracChangeset for help on using the changeset viewer.