Stephen Birarda 112abc9d7e Merge pull request #13148 from birarda/feat/new-version-numbers ... add SHA to PR/master version, add build_type (stable/master/pr/dev)		2018-06-08 14:44:22 -07:00
..
resources	Fix wizard wording	2018-05-02 17:17:19 -07:00
src	Merge pull request #13148 from birarda/feat/new-version-numbers	2018-06-08 14:44:22 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00