Ryan Huffman 665baff665 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate ... Conflicts: interface/src/ui/overlays/Circle3DOverlay.cpp libraries/render-utils/src/RenderDeferredTask.cpp libraries/render-utils/src/RenderDeferredTask.h		2015-06-19 10:07:57 -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	Fixing build issues and finishing up address bar	2015-06-17 14:27:16 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate	2015-06-19 10:07:57 -07:00
ui	Checkpoint auto updater	2015-06-02 19:32:03 -06:00
CMakeLists.txt	Code Review changes	2015-06-10 14:35:52 -06:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in