SamGondelman 3274c41aeb Merge remote-tracking branch 'upstream/pointers' into ui		2017-11-15 17:45:45 -08:00
..
external
i18n
icon
resources	merge with master	2017-11-15 14:35:30 -08:00
src	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest