overte/interface
ZappoMan 1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-17 13:16:11 -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 https://github.com/highfidelity/hifi into librarization 2014-12-17 13:16:11 -08:00
ui Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
CMakeLists.txt move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
interface.icns update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in