Merge branch 'heapmode_alloc_failure_fix' into dev
authorIrwan Djajadi <irwan.djajadi@ni.com>
Tue, 19 Apr 2016 13:22:56 +0000 (08:22 -0500)
committerIrwan Djajadi <irwan.djajadi@ni.com>
Tue, 19 Apr 2016 13:22:56 +0000 (08:22 -0500)
1  2 
lib/lz4.c

diff --cc lib/lz4.c
Simple merge