Stojce Slavkovski 459fed5c7b Merge branch 'master' of https://github.com/worklist/hifi into 19508		2014-04-10 21:52:37 +02:00
..
config
html
icons	Added icons for import dialog buttons	2014-02-19 12:33:05 -08:00
images	Modify icons in Interface "mirror"	2014-04-09 18:54:59 +02: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	add apache license to shader headers	2014-04-09 09:59:05 -07:00
sounds	filename format changes	2014-01-27 20:35:06 +01:00
styles	- Layout fix	2014-03-21 22:34:10 +01:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00
resources.qrc	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-04 21:16:29 +02:00