Seth Alves fbfb6f169b Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject		2016-06-22 10:02:12 -07:00
..
resources	cap lifetime rather than reject edits from nodes which only have tmp-rez rights	2016-06-21 16:48:04 -07:00
src	reformat operating hours to [[open,close]]	2016-06-21 17:19:37 -07:00
CMakeLists.txt	call manual install of ssleay from console install	2016-01-15 15:41:34 -08:00