Changeset b201912 for VERSION


Ignore:
Timestamp:
Apr 11, 2017, 1:49:44 AM (8 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

  • VERSION

    rfbafd2c rb201912  
    11AUBIO_MAJOR_VERSION=0
    22AUBIO_MINOR_VERSION=4
    3 AUBIO_PATCH_VERSION=5
     3AUBIO_PATCH_VERSION=6
    44AUBIO_VERSION_STATUS='~alpha'
    55LIBAUBIO_LT_CUR=5
    6 LIBAUBIO_LT_REV=1
    7 LIBAUBIO_LT_AGE=5
     6LIBAUBIO_LT_REV=2
     7LIBAUBIO_LT_AGE=6
Note: See TracChangeset for help on using the changeset viewer.