Zach Pomerantz c8d3342aca Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape		2016-01-08 17:04:02 -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	movable audio bar	2016-01-07 15:43:51 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into feat/render-shape	2016-01-08 17:04:02 -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