merge with master
authorPaul Brossier <piem@piem.org>
Tue, 19 Jan 2016 15:54:26 +0000 (16:54 +0100)
committerPaul Brossier <piem@piem.org>
Tue, 19 Jan 2016 15:54:26 +0000 (16:54 +0100)
commitf96a808cdb216127ac40d31b45ae48130374fa97
treea1b44111f9aaaec971bfed2e5b7ce92523d41e78
parentbbb53a74bced38a8699d0feb95d8cfc497b7220c
parentd68e077e4e7a8b98d0b0c5d8f661eaa129f3c691
merge with master
example_aubioDemo/src/ofApp.cpp
example_aubioDemo/src/ofApp.h
src/ofxAubioBeat.cpp
src/ofxAubioBeat.h