Stephen Birarda efa0813ae9 Merge remote-tracking branch 'origin/console' into console-dev		2016-01-04 13:18:27 -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 branch 'master' into tony/neuron-plugin	2015-12-25 10:24:55 -08:00
src	Add shared memory back into main.cpp	2016-01-04 11:58:56 -08:00
ui	Add an avatar LOD preference called "Minimum Avatar Display Distance"	2015-12-02 12:12:57 -08:00
CMakeLists.txt	some macro renaming and cleanup	2016-01-04 10:26:37 -08:00