diff options
| author | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:55:42 -0700 |
|---|---|---|
| committer | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:55:42 -0700 |
| commit | 9b5aa3ff27531d233bfffdc4aa8c835e2729c15e (patch) | |
| tree | 8e7612e7dc0adf27a0e4cf658f8a89ae3ad1d55d /toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c | |
| parent | b877d1dc1c5f52cc65393c12efa9769094b2cc7f (diff) | |
| parent | ea4320733f62c7b3ccc34edde6fc95043bb2d663 (diff) | |
Merge branch 'toxav-uaf' of https://github.com/tux3/toxcore
#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Diffstat (limited to 'toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c')
0 files changed, 0 insertions, 0 deletions