Brad Hefta-Gaub 3e05d95478 Merge branch 'master' of https://github.com/highfidelity/hifi into menuGroups		2016-01-11 09:09:37 -08:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n	Updated english translation file	2015-10-15 11:15:06 -07:00
icon
resources	Fix display of File > About Interface window	2016-01-11 15:58:00 +13:00
src	add support for advanced/developer plugins and change diplay modes to match spec	2016-01-08 16:58:25 -08:00
ui	simplify preferences	2016-01-04 15:00:54 -08:00
CMakeLists.txt	NeuronPlugin: Added external project for Neuron SDK	2015-12-21 18:30:15 -08:00