Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

This commit is contained in:
Salvatore La Bua
2014-09-06 20:08:09 +02:00
3 changed files with 55 additions and 10 deletions

View File

@@ -122,7 +122,7 @@
<texture name="inv_folder_snapshot.tga"/>
<texture name="inv_folder_sound.tga"/>
<texture name="inv_folder_texture.tga"/>
<texture name="inv_folder_trash.tga"/>
<texture name="inv_folder_trash.tga" preload="true"/>
<texture name="inv_item_animation.tga"/>
<texture name="inv_item_skin.tga"/>