diff options
| -rw-r--r-- | src/ChangeLog | 3 |
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 |