Andrew Meadows aa5a59c3dc merge upstream/master into andrew/nova ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp		2015-05-05 10:24:17 -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	Merge pull request #4724 from jherico/menu_polish	2015-05-04 23:44:06 -07:00
src	merge upstream/master into andrew/nova	2015-05-05 10:24:17 -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	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in