diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-28 02:39:40 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-28 02:39:40 +0800 |
| commit | 342bde963e6a4e29ddb6d9f288a521391daf0fd3 (patch) | |
| tree | 558bb616e277b5a0cb5020ea4f5bf8f4688d2822 /addressbook | |
| parent | 18a3cac18aeaca1f34268a5e022c8d255b4fa70f (diff) | |
| download | gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.gz gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.bz2 gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.lz gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.xz gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.tar.zst gsoc2013-evolution-342bde963e6a4e29ddb6d9f288a521391daf0fd3.zip | |
fixed merge conflicts
svn path=/trunk/; revision=25637
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ca0b356cc6..bf053d008d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -148,11 +148,13 @@ migrating the company phone numbers. 2004-04-21 Sivaiah Nallagatla <snallagatla@novell.com> - - * gui/component/addressbook.c (remove_parameters_from_uri) : added - a new function to striff off any parameters present after ';' in the uri - (load_source_auth_cb) (addressbook_authenticate) : call above function to - remove anything after ';' before passing uri to e-password calls + + * gui/component/addressbook.c (remove_parameters_from_uri) : added + a new function to striff off any parameters present after ';' in + the uri + (load_source_auth_cb) (addressbook_authenticate) : call above + function to remove anything after ';' before passing uri to + e-password calls 2004-04-21 Hans Petter Jansson <hpj@ximian.com> @@ -213,7 +215,6 @@ * gui/contact-editor/e-contact-editor.c (new_target_cb): addressbook_show_load_error_dialog -> eab_load_error_dialog. ->>>>>>> 1.1665 2004-04-19 Rodney Dawes <dobey@ximian.com> * gui/contact-editor/contact-editor.glade: Set the default image for |