aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2007-09-03 13:07:59 +0000
committerMarcus Brinkmann <[email protected]>2007-09-03 13:07:59 +0000
commitb3de8cd674063c53a24766f8fa0b374425dd1a49 (patch)
tree09130ea533d33376f6be861bd9c100aef3e75ad0
parentdoc/ (diff)
downloadlibassuan-b3de8cd674063c53a24766f8fa0b374425dd1a49.tar.gz
libassuan-b3de8cd674063c53a24766f8fa0b374425dd1a49.zip
doc/
2007-09-03 Marcus Brinkmann <[email protected]> * assuan.texi: Fix prototype and documentation for assuan_inquire_ext. src/ 2007-09-03 Marcus Brinkmann <[email protected]> * assuan.h (assuan_inquire_ext): Move buffer and buffer_length arguments callback in prototype. * assuan-defs.h (struct assuan_context_s): Remove members inquire_r_buffer and inquire_r_buffer_len. Add buffer and buffer length arguments to inquire_cb. * assuan-inquire.c (_assuan_inquire_ext_cb): Return buffer and buffer length via callback. (assuan_inquire_ext): Move buffer and buffer length arguments to callback.
-rw-r--r--src/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 65ec799..2935d9f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< .mine
2007-09-03 Marcus Brinkmann <[email protected]>
* assuan.h (assuan_inquire_ext): Move buffer and buffer_length
@@ -11,12 +10,10 @@
(assuan_inquire_ext): Move buffer and buffer length arguments to
callback.
-=======
2007-08-24 Werner Koch <[email protected]>
Switched license to back to LGPLv2.1.
->>>>>>> .r250
2007-08-09 Marcus Brinkmann <[email protected]>
* assuan.h (assuan_process_done, assuan_inquire_ext): New