android/Pictogram/tabletlibrary · 7c78dce0965d6c7cfea95ba2b9e94a69e5afaeb8 · yotta / pictogram · GitLab

Find file History

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop · 7c78dce0
```
# Conflicts:
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java
```
Fernando Martínez Santiago committed Dec 22, 2016
7c78dce0 Browse Files

Name	Last commit	Last Update
..
src/main		Loading commit data...
.gitignore		Loading commit data...
build.gradle		Loading commit data...
proguard-rules.pro		Loading commit data...
tabletlibrary.iml		Loading commit data...