Commit a51cf5d5 authored by pbethge's avatar pbethge
Browse files

Merge branch 'develop' into bugfix/input_channels

parents fb135c0a 7e52302c
......@@ -8,7 +8,7 @@
# The location of your root openFrameworks installation
# (default) OF_ROOT = ../../of/of_v0.11.2_osx_release
################################################################################
OF_ROOT = /Users/wilcox/src/of/of_v0.11.2_osx_release
OF_ROOT = ../../..
################################################################################
# PROJECT ROOT
......
......@@ -324,10 +324,10 @@ void ofApp::keyPressed(int key) {
break;
case 'a':
if(autostop) {
enableAutostop();
disableAutostop();
}
else {
disableAutostop();
enableAutostop();
}
break;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment