android/Pictogram/app/src/main/res/drawable-hdpi · ad83e21c9bc2e126e442dc0e92012102504d10f8 · yotta / pictogram · GitLab

Find file History

Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into fernando_branch · 741bbc42
```
Conflicts:
	android/Pictogrammar/.idea/gradle.xml
	android/Pictogrammar/app/app.iml
```
Fernando Martínez Santiago committed Mar 17, 2016
741bbc42

Name	Last commit	Last Update
..
back64.png		Loading commit data...
ic_action.png		Loading commit data...
ic_action_1.png		Loading commit data...
ic_launcher.png		Loading commit data...
pictoff.png		Loading commit data...
picton.png		Loading commit data...
play64.png		Loading commit data...
redcross.png		Loading commit data...