android/Pictogram · 57b7f0d80bf092fd1d86c04ba3b779a628226f8a · yotta / pictogram

Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop · 57b7f0d8

# Conflicts:
#	android/Pictogram/tabletlibrary/build.gradle
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/MainActivity.java
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java

committed Mar 10, 2017

57b7f0d8

Name	Last commit	Last Update
..
commonlibrary		Loading commit data...
docs		Loading commit data...
gradle/wrapper		Loading commit data...
supervisor_tablet		Loading commit data...
tabletlibrary		Loading commit data...
watch		Loading commit data...
yotta_tablet		Loading commit data...
.gitignore		Loading commit data...
build.gradle		Loading commit data...
gradle.properties		Loading commit data...
gradlew		Loading commit data...
gradlew.bat		Loading commit data...
settings.gradle		Loading commit data...