GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some CVS conflict cruft

Browse Source
This commit is contained in:
Marcus Brinkmann 2001-11-20 06:03:02 +00:00
parent 8cd3685382
commit 01b5f56f83
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/gpgme/ChangeLog
View File

@ -38,7 +38,6 @@
* ops.h (_gpgme_get_program_version): Add prototype for * ops.h (_gpgme_get_program_version): Add prototype for
_gpgme_get_program_version (we expect to use it elsewhere soon). _gpgme_get_program_version (we expect to use it elsewhere soon).
>>>>>>> 1.44
2001-11-18 Marcus Brinkmann <marcus@g10code.de> 2001-11-18 Marcus Brinkmann <marcus@g10code.de>
* version.c (get_engine_info): If GnuPG is not available, return * version.c (get_engine_info): If GnuPG is not available, return