Andrew Meadows d4e72df928 Merge pull request #10711 from burtsloane/midi ... Midi support for Entities		2017-07-28 10:51:43 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge pull request #11064 from highfidelity/bug/6513	2017-07-28 09:46:34 -07:00
src	Merge pull request #10711 from burtsloane/midi	2017-07-28 10:51:43 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
interface.exe.manifest