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

34075327 · Fernando Martínez Santiago · 7f43ca45 · 4685fb76 · 7f43ca45 · 34075327
Commit 34075327 authored Mar 13, 2017 by Fernando Martínez Santiago
Showing with 0 additions and 0 deletions
android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.jpg
android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.png
android/Pictogram/tabletlibrary/src/main/res/drawable/pictogram_logo.png
--- a/android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.jpg
+++ b/android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.jpg
--- a/android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.png
+++ b/android/Pictogram/tabletlibrary/src/main/res/drawable/ic_launcher.png
--- a/android/Pictogram/tabletlibrary/src/main/res/drawable/pictogram_logo.png
+++ b/android/Pictogram/tabletlibrary/src/main/res/drawable/pictogram_logo.png