stojce 8dc6ca75a4 Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts interface/resources/resources.qrc interface/src/Menu.cpp		2014-04-04 21:16:29 +02: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	Manual merge	2014-04-02 18:07:55 -07: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	Use the "correct" shadow strategy: include only ambient term when in shadow.	2014-03-27 13:44:34 -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