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
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Working on line height	2015-07-17 14:33:32 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-20 14:53:19 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	Enhancing PR installer titles	2015-07-01 14:13:37 -04:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in