Ryan Huffman d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx ... Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp		2015-05-22 15:33:40 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx	2015-05-22 15:33:40 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	merging and updating	2015-05-20 16:50:43 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in