]> WPIA git - gigi.git/commit
Merge branch 'libs/scrypt/upstream' into libs/scrypt/local
authorFelix Dörre <felix@dogcraft.de>
Tue, 2 Dec 2014 01:13:31 +0000 (02:13 +0100)
committerFelix Dörre <felix@dogcraft.de>
Tue, 2 Dec 2014 01:13:31 +0000 (02:13 +0100)
commit9a6b487b4f52523dc76dd8307bbc6429a425a56a
treef530edc40feeb272fdfa6124bf3df33e2b5827fd
parentb0551e6dc16f63a7238a981f702ca291920e8f65
parent8cd6cfda6e99fd09acb1f0d158d57dbba7356cbc
Merge branch 'libs/scrypt/upstream' into libs/scrypt/local