Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

Conflicts:
	aux/bro-aux
	aux/broccoli
This commit is contained in:
Robin Sommer 2014-07-10 20:11:52 -07:00
commit aeb8e71e8c
10 changed files with 106 additions and 15 deletions

View file

@ -8,9 +8,9 @@ export {
## 'none' -- No compression.
## 'lzf' -- LZF compression (very quick, but leads to larger output files).
## 'lzo' -- LZO compression (very fast decompression times).
## 'gz' -- GZIP compression (slower than LZF, but also produces smaller output).
## 'zlib' -- GZIP compression (slower than LZF, but also produces smaller output).
## 'bz2' -- BZIP2 compression (slower than GZIP, but also produces smaller output).
const compression = "gz" &redef;
const compression = "zlib" &redef;
## The extent buffer size.
## Larger values here lead to better compression and more efficient writes,