Merge pull request #152 from gm4tr1x/buf

author Jens Steube <jens.steube@gmail.com>

Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)

committer Jens Steube <jens.steube@gmail.com>

Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)
author Jens Steube <jens.steube@gmail.com>
Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)
committer Jens Steube <jens.steube@gmail.com>
Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)
diff --cc src/oclHashcat.c
Simple merge
diff --cc src/shared.c
Simple merge
author	Jens Steube <jens.steube@gmail.com>
	Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)
committer	Jens Steube <jens.steube@gmail.com>
	Sun, 24 Jan 2016 15:24:10 +0000 (16:24 +0100)
		1	2
src/oclHashcat.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared.c	patch \|	diff1 \|	diff2 \|	blob \| history