Brad Hefta-Gaub 72f9ae3e85 Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation ... Fix auto start animation		2015-04-15 10:14:26 -07:00
..
external	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -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 pull request #4643 from ctrlaltdavid/fix-auto-start-animation	2015-04-15 10:14:26 -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	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in