Thijs Wenker 8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561		2014-04-16 11:28:46 +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	Initial script editor widget / icons made by MaximillianMerlin ty	2014-04-15 00:30:01 +02:00
images	Merge remote-tracking branch 'upstream/master' into 19554	2014-04-14 11:20:49 -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	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	Allow users to set the destination of Snapshots	2014-04-15 19:36:02 +02:00
visage	Add Ryan's updated smoothing factors.	2014-03-21 10:38:29 -07:00