android/Pictogram/communicator/src/main · 850d9d2736e518bdb7299c4e64f91bce35fdfcfd · yotta / pictogram

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

# Conflicts:
#	android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
#	android/Pictogram/supervisor/supervisor.iml
#	android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java

committed Nov 30, 2017

283cc883

Name	Last commit	Last Update
..
assets/core_vocabulary		Loading commit data...
java/com/yottacode/pictogram/communicator		Loading commit data...
res		Loading commit data...
AndroidManifest.xml		Loading commit data...