remove conflict indicator ...
This commit is contained in:
parent
1ec7ac3ce7
commit
af258e0dec
1
CHANGES
1
CHANGES
@ -18,7 +18,6 @@
|
|||||||
*) Support BS2000/OSD-POSIX.
|
*) Support BS2000/OSD-POSIX.
|
||||||
[Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]
|
[Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]
|
||||||
|
|
||||||
>>>>>>> 1.252
|
|
||||||
*) Make callbacks for key generation use void * instead of char *.
|
*) Make callbacks for key generation use void * instead of char *.
|
||||||
[Ben Laurie]
|
[Ben Laurie]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user