overte/interface
Brad Hefta-Gaub 04471f1c88 Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR
Conflicts:
	interface/src/Application.cpp
2016-04-04 13:16:39 -07: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 replace the interface icons 2016-03-25 11:42:48 -07:00
resources Merge pull request #7545 from birarda/marketplace-to-examples 2016-04-03 14:25:00 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into simpleTestPR 2016-04-04 13:16:39 -07:00
ui Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
CMakeLists.txt Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
interface.exe.manifest Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00