SIGN IN SIGN UP

openFrameworks is a community-developed cross platform toolkit for creative coding in C++.

0 0 0 C++

Merge branch 'master' into android_life_cycle

Conflicts:
	addons/ofxAndroid/src/ofAppAndroidWindow.cpp
T
Tal Lavi committed
7390d13508f5cbfde6b2e6b59202e292cebcf192