Clément Brisset b7ac07f590 Merge pull request #12589 from highfidelity/RC65 ... merge back RC65 to master after RC hotfixes		2018-03-07 17:22:41 -08:00
..
resources	fixes for comments from code reviews	2018-02-26 14:35:34 -08:00
src	Merge pull request #12589 from highfidelity/RC65	2018-03-07 17:22:41 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00