howard-stearns 830dcb582a Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing		2016-01-13 13:32:38 -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	Merge pull request #6812 from jherico/running_scripts	2016-01-12 13:40:47 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing	2016-01-13 13:32:38 -08:00
ui	Layout for running scripts	2016-01-12 12:40:42 -08:00
CMakeLists.txt	NeuronPlugin: Added external project for Neuron SDK	2015-12-21 18:30:15 -08:00