Stephen Birarda 7304e695b3 resolve conflicts on merge with upstream/master		2016-01-04 15:40:16 -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	resolve conflicts on merge with upstream/master	2016-01-04 15:40:16 -08:00
ui	checkpoint	2015-12-15 16:07:37 -08:00
CMakeLists.txt	Merge branch 'master' of github.com:highfidelity/hifi	2015-12-31 09:06:44 -06:00