Ignore:
Timestamp:
Sep 15, 2018, 6:30:42 PM (18 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/constantq
Children:
45c2c5c
Parents:
81fe7d30 (diff), 8c4918a (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 feature/constantq

File:
1 edited

Legend:

Unmodified
Added
Removed
  • python/ext/aubiomodule.c

    r81fe7d30 r6203a70  
    243243  {"level_detection", Py_aubio_level_detection, METH_VARARGS, Py_aubio_level_detection_doc},
    244244  {"window", Py_aubio_window, METH_VARARGS, Py_aubio_window_doc},
     245  {"shift", Py_aubio_shift, METH_VARARGS, Py_aubio_shift_doc},
     246  {"ishift", Py_aubio_ishift, METH_VARARGS, Py_aubio_ishift_doc},
    245247  {NULL, NULL, 0, NULL} /* Sentinel */
    246248};
Note: See TracChangeset for help on using the changeset viewer.