Seth Alves ba43640950 Merge pull request #12785 from birarda/bug/xcode-warnings ... fix some xcode warnings for unnecessary captured this		2018-04-20 10:30:27 -07:00
..
resources	Merge pull request #12692 from highfidelity/stable	2018-03-22 15:08:30 -07:00
src	Merge pull request #12785 from birarda/bug/xcode-warnings	2018-04-20 10:30:27 -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