Howard Stearns 0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate		2015-08-13 15:56:13 -07:00
..
external	Merge branch 'master' into 20639	2015-08-05 16:49:06 -07:00
icon
resources	Cleanup and PR comments	2015-08-08 13:54:37 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate	2015-08-13 15:56:13 -07:00
ui	apperance => appearance	2015-08-13 14:42:37 -07:00
CMakeLists.txt	Merge branch 'master' into 20639	2015-08-11 12:34:28 -07:00
interface_en.ts
InterfaceVersion.h.in