Merge branch 'master' of https://github.com/hashcat/oclHashcat
authorJens Steube <jens.steube@gmail.com>
Tue, 24 May 2016 17:31:14 +0000 (19:31 +0200)
committerJens Steube <jens.steube@gmail.com>
Tue, 24 May 2016 17:31:14 +0000 (19:31 +0200)
1  2 
src/hashcat.c

diff --cc src/hashcat.c
Simple merge