Xineroks 22ba2f21c7 Merge remote-tracking branch 'refs/remotes/origin/master' ...

Conflicts:
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/java/htdinc/howtodrink/MainActivity.java
	mobile/src/main/res/layout/activity_main.xml

2016-06-01 09:24:36 +02:00

.idea

Push DataBase et Controller

2016-06-01 09:21:43 +02:00

gradle/wrapper

First project commit

2016-05-30 15:12:16 +02:00

mobile

Merge remote-tracking branch 'refs/remotes/origin/master'

2016-06-01 09:24:36 +02:00

.gitignore

First project commit

2016-05-30 15:12:16 +02:00

build.gradle

First project commit

2016-05-30 15:12:16 +02:00

data.txt

Set un first screen

2016-06-01 09:18:05 +02:00

gradle.properties

Push DataBase et Controller

2016-06-01 09:21:43 +02:00

gradlew

First project commit

2016-05-30 15:12:16 +02:00

gradlew.bat

First project commit

2016-05-30 15:12:16 +02:00

LICENCE.txt

Premier commit sur le git HTD

2016-05-30 11:50:36 +02:00

settings.gradle

First project commit

2016-05-30 15:12:16 +02:00

Description

No description provided

139 KiB

Languages

Java 100%