Brad Hefta-Gaub b0c286bc3b Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay ... Conflicts: interface/src/Application.cpp		2016-02-25 16:21:38 -08:00
..
external	Remove RealSense & MIDI	2015-12-03 11:00:01 -08:00
i18n
icon
resources	Merge pull request #7185 from ctrlaltdavid/20809	2016-02-24 16:20:40 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into toggleOverlay	2016-02-25 16:21:38 -08:00
ui	Allow closed tabs to delete properly	2016-02-11 10:27:24 -08:00
CMakeLists.txt	Add BugSplat to interface	2016-02-09 10:48:32 -08:00