diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
| commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
| tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /ssh-pkcs11-helper.0 | |
| parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
| parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) | |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'ssh-pkcs11-helper.0')
| -rw-r--r-- | ssh-pkcs11-helper.0 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssh-pkcs11-helper.0 b/ssh-pkcs11-helper.0 index 2f8a674aa..dcfaa222a 100644 --- a/ssh-pkcs11-helper.0 +++ b/ssh-pkcs11-helper.0 | |||
| @@ -22,4 +22,4 @@ HISTORY | |||
| 22 | AUTHORS | 22 | AUTHORS |
| 23 | Markus Friedl <markus@openbsd.org> | 23 | Markus Friedl <markus@openbsd.org> |
| 24 | 24 | ||
| 25 | OpenBSD 5.2 February 10, 2010 OpenBSD 5.2 | 25 | OpenBSD 5.3 February 10, 2010 OpenBSD 5.3 |