aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/merging/eab-contact-merging.h
Commit message (Expand)AuthorAgeFilesLines
* Merge revisions 36016:36303 from trunk.Matthew Barnes2008-09-111-3/+17
* updated novell copyright notices (left others alone)Jeffrey Stedfast2008-06-211-1/+1
* EBookContactsCallback -> EBookListCallback. (eab_nickname_query): same.Chris Toshok2004-06-181-1/+1
* Various changes to merge in evolution-data-server reliance.JP Rosevear2003-11-071-1/+1
* Merge new-ui-branch to the trunk.Ettore Perazzoli2003-10-221-0/+30