Merge pull request #1304 from facebook/largeNbDicts

author Yann Collet <Cyan4973@users.noreply.github.com>

Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)

committer GitHub <noreply@github.com>

Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)
committer GitHub <noreply@github.com>
Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)
diff --cc Makefile
Simple merge
diff --cc lib/dictBuilder/zdict.h
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)
committer	GitHub <noreply@github.com>
	Thu, 6 Sep 2018 16:50:56 +0000 (09:50 -0700)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/dictBuilder/zdict.h	patch \|	diff1 \|	diff2 \|	blob \| history