android/Pictogram/tabletlibrary/src/main/res · d5c40671bc2da587db360d954e5fc4a4b4f5ce4f · 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 Browse Files

Name	Last commit	Last Update
..
anim		Loading commit data...
drawable		Loading commit data...
drawable-hdpi		Loading commit data...
drawable-mdpi		Loading commit data...
drawable-xhdpi		Loading commit data...
drawable-xxhdpi		Loading commit data...
drawable-xxxhdpi		Loading commit data...
layout		Loading commit data...
menu		Loading commit data...
mipmap-hdpi		Loading commit data...
mipmap-mdpi		Loading commit data...
mipmap-xhdpi		Loading commit data...
mipmap-xxhdpi		Loading commit data...
mipmap-xxxhdpi		Loading commit data...
values		Loading commit data...
values-en		Loading commit data...
values-es		Loading commit data...