Merge branch 'master' of https://github.com/hashcat/oclHashcat

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

Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)

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

Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)
author Jens Steube <jens.steube@gmail.com>
Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)
committer Jens Steube <jens.steube@gmail.com>
Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)
diff --cc include/shared.h
Simple merge
diff --cc src/oclHashcat.c
Simple merge
diff --cc src/shared.c
Simple merge
author	Jens Steube <jens.steube@gmail.com>
	Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)
committer	Jens Steube <jens.steube@gmail.com>
	Sat, 6 Feb 2016 22:22:38 +0000 (23:22 +0100)
		1	2
include/shared.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/oclHashcat.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared.c	patch \|	diff1 \|	diff2 \|	blob \| history