Dante Ruiz fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man		2017-09-05 16:26:51 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge pull request #11107 from mnafees/21412	2017-09-05 13:05:05 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
interface.exe.manifest