Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev
authorinikep <inikep@gmail.com>
Sat, 3 Sep 2016 06:10:16 +0000 (08:10 +0200)
committerinikep <inikep@gmail.com>
Sat, 3 Sep 2016 06:10:16 +0000 (08:10 +0200)
commit58a1616d7b272e624f78e713fcd37172f845f576
tree579df140753d421293418ba6b112c4d68df0e085
parentc77fdb44f101c81ef7740d67fdf77a5f065bc04f
parent28f98647e3349a4a0a9c8975199aa89f2a02f6b9
Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts:
# programs/Makefile
programs/Makefile
programs/lz4cli.c