app/src/main/java/com · c126466b78f21e6a6df69a1dd21f854cba1ce72f · Boston University / Ear recognition · GitLab

History Find file

Merge remote-tracking branch 'origin/develop' into take-picture-refactoring · 6c47e90f
Josejulio Martínez Magaña authored Nov 26, 2015
```
# Conflicts:
#	app/src/main/java/com/aluxoft/earrecognition/intents/IntentTransferingFeatures.java
```
6c47e90f

Name	Last commit	Last update
..
aluxoft		Loading commit data...