Learn more about cloning repositories
You have read-only access
Merge branch 'master' into refactor Conflicts: examples/updater/main.cpp examples/updater/updater.cpp examples/updater/updater.pro
