David Rowe 649d4736cd Merge branch 'master' into dde-miscellaneous		2015-04-22 13:00:40 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	editEntities.js --> edit.js	2015-03-27 14:40:16 -07:00
src	Merge branch 'master' into dde-miscellaneous	2015-04-22 13:00:40 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -07:00
CMakeLists.txt	remove VISAGE handling in interface CMakeLists	2015-04-17 14:27:58 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in