Seth Alves 284215d46a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol		2015-04-21 09:53:15 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	editEntities.js --> edit.js	2015-03-27 14:40:16 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-21 09:53:15 -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