Andrew Meadows 67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia ... Conflicts: interface/src/Application.cpp libraries/entities/src/EntityItem.h		2014-12-15 14:46:46 -08:00
..
external	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
resources	remove old unused shaders	2014-12-11 13:59:21 -08:00
src	Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia	2014-12-15 14:46:46 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	move back into interface for now	2014-12-15 08:37:33 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in