Seth Alves ce1b8ae6f0 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting		2016-01-04 19:35:36 -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 #6762 from ZappoMan/hideMirrorAndAudioInHMD	2016-01-04 18:03:33 -05:00
src	Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting	2016-01-04 19:35:36 -08:00
ui	checkpoint	2015-12-15 16:07:37 -08:00
CMakeLists.txt	NeuronPlugin: Added external project for Neuron SDK	2015-12-21 18:30:15 -08:00