new file:   .classpath
	new file:   .cproject
	new file:   .project
	new file:   .settings/org.eclipse.jdt.core.prefs
	new file:   bin/AndroidManifest.xml
	new file:   bin/MainActivity.apk
	new file:   bin/R.txt
	new file:   bin/classes.dex
	new file:   bin/classes/.gitignore
	new file:   bin/dexedLibs/opencv library - 2.4.9-f70dc5eef99a52dce4fdb5c8b873ef21.jar
	new file:   bin/res/crunch/drawable-hdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-mdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-xhdpi/ic_launcher.png
	new file:   bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	new file:   bin/resources.ap_
	new file:   gen/.gitignore
	new file:   jni/Android.mk
	new file:   jni/Application.mk
	new file:   jni/DetectionBasedTracker_jni.cpp
	new file:   jni/DetectionBasedTracker_jni.h
	new file:   libs/armeabi-v7a/libdetection_based_tracker.so
	new file:   obj/local/armeabi-v7a/libdetection_based_tracker.so
	new file:   obj/local/armeabi-v7a/objs/detection_based_tracker/DetectionBasedTracker_jni.o
	new file:   obj/local/armeabi-v7a/objs/detection_based_tracker/DetectionBasedTracker_jni.o.d
	new file:   project.properties
	new file:   res/raw/lbpcascade_frontalface.xml
	new file:   src/it/peretti/kofler/androidfingerdetection/DetectionBasedTracker.java
	modified:   src/it/peretti/kofler/androidfingerdetection/HandDetection.java
	modified:   src/it/peretti/kofler/androidfingerdetection/MainActivity.java
Merge branch 'master' of https://github.com/flinki/AndroidFingerDetection

Conflicts:
	.project
	project.properties

	modified:   .project
	new file:   libs/android-support-v4.jar
	modified:   project.properties