android-app/res/values
GAULUPEAU Jonathan 7fb608b8d7 Merge branch 'HEAD'; commit '27bbd7b'
Conflicts:
	AndroidManifest.xml
	src/fr/gaulupeau/apps/Poche/Poche.java
2013-11-11 23:12:01 +01:00
..
dimens.xml Init 2013-08-08 14:38:47 +02:00
strings.xml Merge branch 'HEAD'; commit '27bbd7b' 2013-11-11 23:12:01 +01:00