Stephen Birarda edade7baba resolve conflicts on merge with upstream master		2015-05-01 16:24:16 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	don't save default values in json file	2015-04-30 11:28:27 -07:00
src	resolve conflicts on merge with upstream master	2015-05-01 16:24:16 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in