Seth Alves f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol		2015-04-20 08:49:33 -07:00
..
external	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
icon
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-20 08:49:33 -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 the console window created when you start interface on win32 platforms	2015-04-06 12:59:44 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in