[svn] assuan - r252 - trunk/src

[svn author marcus]

Author: marcus
Date: 2007-09-03 15:07:59 +0200 (Mon, 03 Sep 2007)
New Revision: 252

Modified:
   trunk/src/ChangeLog
Log:
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.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-09-03 12:29:07 UTC (rev 251)
+++ trunk/src/ChangeLog	2007-09-03 13:07:59 UTC (rev 252)
@@ -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