Files
customCamera/src/android
Christophe BOUCAUT d6187e267c Merge branch 'master' into issue#6
Conflicts:
	src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
2014-12-15 10:18:07 +01:00
..