diff options
| author | Damien Miller <djm@mindrot.org> | 2014-05-27 14:27:02 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-05-27 14:27:02 +1000 |
| commit | eae88744662e6b149f43ef071657727f1a157d95 (patch) | |
| tree | 6b22697e5a2f805559e2fe3457fb6b9f644279f5 /ChangeLog | |
| parent | 564b5e253c1d95c26a00e8288f0089a2571661c3 (diff) | |
- (djm) [cipher.c] Fix merge botch.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
| @@ -1,3 +1,6 @@ | |||
| 1 | 20140527 | ||
| 2 | - (djm) [cipher.c] Fix merge botch. | ||
| 3 | |||
| 1 | 20140522 | 4 | 20140522 |
| 2 | - (djm) [Makefile.in] typo in path | 5 | - (djm) [Makefile.in] typo in path |
| 3 | 6 | ||