changes

changes
Merge branch 'master' of https://github.com/tokujin/FlyOntheWall2

Conflicts:

FixedFixedEnd_Vibration/FixedFixedEnd_Vibration.xcodeproj/project.xcwork
space/xcuserdata/Nori.xcuserdatad/UserInterfaceState.xcuserstate
	string_vibration02/Makefile
	string_vibration02/Project.xcconfig
	string_vibration02/addons.make
	string_vibration02/bin/data/.gitkeep
	string_vibration02/bin/data/particle.png

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Resources/English.lproj/GLUT.nib/objects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Resources/English.lproj/GLUTClipboard.nib/objects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Resources/English.lproj/GLUTPreferences.nib/objects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Resources/English.lproj/GLUTUI.strings

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Resources/English.lproj/InfoPlist.strings

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects
.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objec
ts.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/A/Resources/English.lproj/GLUTUI.strings

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/A/Resources/English.lproj/InfoPlist.strings

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/Current/Resources/English.lproj/GLUT.nib/objects.ni
b

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/Current/Resources/English.lproj/GLUTClipboard.nib/o
bjects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/Current/Resources/English.lproj/GLUTPreferences.nib
/objects.nib

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/Current/Resources/English.lproj/GLUTUI.strings

string_vibration02/bin/string_vibrationDebug.app/Contents/Frameworks/GLU
T.framework/Versions/Current/Resources/English.lproj/InfoPlist.strings
	string_vibration02/bin/string_vibrationDebug.app/Contents/PkgInfo
	string_vibration02/config.make
	string_vibration02/openFrameworks-Info.plist
	string_vibration02/src/main.cpp
	string_vibration02/src/testApp.cpp
	string_vibration02/src/testApp.h
	string_vibration02/string_vibration.xcodeproj/project.pbxproj

string_vibration02/string_vibration.xcodeproj/project.xcworkspace/conten
ts.xcworkspacedata

string_vibration02/string_vibration.xcodeproj/project.xcworkspace/xcshar
eddata/string_vibration.xccheckout

string_vibration02/string_vibration.xcodeproj/project.xcworkspace/xcuser
data/Nori.xcuserdatad/UserInterfaceState.xcuserstate

string_vibration02/string_vibration.xcodeproj/xcshareddata/xcschemes/str
ing_vibration Debug.xcscheme

string_vibration02/string_vibration.xcodeproj/xcshareddata/xcschemes/str
ing_vibration Release.xcscheme

string_vibration02/string_vibration.xcodeproj/xcuserdata/Nori.xcuserdata
d/xcdebugger/Breakpoints_v2.xcbkptlist

string_vibration02/string_vibration.xcodeproj/xcuserdata/Nori.xcuserdata
d/xcschemes/xcschememanagement.plist