projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
remove conflict indicator ...
[openssl.git]
/
CHANGES
diff --git
a/CHANGES
b/CHANGES
index 3f425a3b95181efb60245fb824fd4c8595c8eab0..ae847366a4ba5e104f3eb01297b0f6ffa2f727e9 100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-18,7
+18,6
@@
*) Support BS2000/OSD-POSIX.
[Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]
->>>>>>> 1.252
*) Make callbacks for key generation use void * instead of char *.
[Ben Laurie]