[Pkg-gnupg-commit] [libassuan] 199/437: doc/ 2007-09-03 Marcus Brinkmann <marcus at g10code.de>

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit b3de8cd674063c53a24766f8fa0b374425dd1a49
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Mon Sep 3 13:07:59 2007 +0000

    doc/
    2007-09-03  Marcus Brinkmann  <marcus at g10code.de>
    
    	* assuan.texi: Fix prototype and documentation for
    	assuan_inquire_ext.
    
    src/
    2007-09-03  Marcus Brinkmann  <marcus at g10code.de>
    
    	* 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.
---
 src/ChangeLog | 3 ---
 1 file changed, 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  <marcus at g10code.de>
 
 	* 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  <wk at g10code.com>
 
 	Switched license to back to LGPLv2.1.
 
->>>>>>> .r250
 2007-08-09  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan.h (assuan_process_done, assuan_inquire_ext): New

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git