Files
customCamera/res
Christophe Boucaut 2ec58daee2 Merge branch 'transform-to-plugin'
Conflicts:
	src/android/customCamera/res/layout/activity_camera_view.xml
	src/android/customCamera/src/org/geneanet/customcamera/CameraView.java
	src/android/customCamera/src/org/geneanet/customcamera/MainActivity.java
2014-11-14 16:26:38 +01:00
..