projects / hashcat.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 700ed7d 1146c43)
Merge branch 'master' into GetRidOfCUDA
authorJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:24 +0000 (01:09 +0100)
committerJens Steube <jens.steube@gmail.com>
Fri, 1 Jan 2016 00:09:24 +0000 (01:09 +0100)
Conflicts:
docs/BUILD.md


Trivial merge
Hashcat additions to support pwdhash