Niraj Venkat 85c9ee0feb Merge branch 'master' of https://github.com/highfidelity/hifi into avatar ... Conflicts: libraries/render-utils/src/AmbientOcclusionEffect.cpp		2015-07-20 14:53:19 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-20 14:53:19 -07:00
CMakeLists.txt	another attempt	2015-06-18 09:43:39 -07:00