Ryan Huffman 0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging		2016-01-15 10:46:22 -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	Stop looping on URL fixing	2016-01-07 10:52:28 -08:00
src	Merge branch 'console' of github.com:birarda/hifi into console-logging	2016-01-15 10:46:22 -08:00
ui	simplify preferences	2016-01-04 15:00:54 -08:00
CMakeLists.txt	fix stars file discovery without full binary dir include	2016-01-04 15:52:06 -08:00