generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove conflict indicator ...

Browse Source
This commit is contained in:
Bodo Möller 1999-06-04 21:52:12 +00:00
parent 1ec7ac3ce7
commit af258e0dec
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -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]