John Conklin II 99b5835098 Merge pull request #13344 from birarda/feat/new-version-numbers ... handle semantic version numbers in interface/sandbox update		2018-06-13 11:16:56 -07:00
..
externals	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-06-12 17:00:25 -07:00
installer
macros	force git abbreviated SHA to have length of 7	2018-06-08 17:21:09 -07:00
modules	add etc2comp dependency on desktop and android	2018-05-08 17:30:48 -07:00
templates	Merge pull request #13344 from birarda/feat/new-version-numbers	2018-06-13 11:16:56 -07:00
compiler.cmake
init.cmake