Zach Fox 08edc52932 Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup		2017-12-20 09:18:10 -08:00
..
external
i18n
icon
resources	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel	2017-12-20 09:18:10 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
ui
CMakeLists.txt	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
interface.exe.manifest