stojce 8decf55e3f Merge branch 'master' of https://github.com/worklist/hifi into 19508		2014-03-08 13:19:45 +01:00
..
config	Add import configuration	2014-01-10 23:26:58 +01:00
html	popup layot	2013-09-09 23:27:03 +02:00
icons	Added icons for import dialog buttons	2014-02-19 12:33:05 -08:00
images	update resource references to use Qt resource system	2014-03-06 10:41:11 -08:00
info	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
meshes	Switched from loading FBX and FST simultaneously to loading FST first, then	2014-02-11 14:20:52 -08:00
shaders	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
sounds	filename format changes	2014-01-27 20:35:06 +01:00
styles	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-08 13:19:45 +01:00