Stephen Birarda 0fe3213d38 Merge branch 'master' of https://github.com/highfidelity/hifi into atp		2015-08-05 11:16:34 -07:00
..
resources	Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options.	2015-08-04 07:23:24 -07:00
src	first adjustment in NLPacket after type is known	2015-07-23 16:59:08 -07:00
CMakeLists.txt