Changeset 41b985f for python/lib/aubio/__init__.py

Timestamp:

Mar 12, 2017, 11:26:24 AM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (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 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• python/lib/aubio/__init__.py (modified) (1 diff)

python/lib/aubio/__init__.py

@@ -2 +2 @@
 
 import numpy
+from ._aubio import __version__ as version
+from ._aubio import float_type
 from ._aubio import *
-from ._aubio import float_type
 from .midiconv import *
 from .slicing import *