Brad Hefta-Gaub 6ac9b737d2 Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux ... Conflicts: interface/src/Application.cpp		2016-01-12 10:35:24 -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	Moving running scripts functionality to scripting library	2016-01-11 12:44:03 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux	2016-01-12 10:35:24 -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