[evolution-kolab/ek-wip-porting-imapx: 2/4] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

[Christian Hilberg <chilberg src gnome org>]

commit f81c326bbae1bdbc5cc2b29980b8f2b64a6cd5e9
Merge: 5eaa83e 5cdf364
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Feb 7 16:33:42 2012 +0100

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

 src/camel/providers/imapx/camel-imapx-folder.c   |   91 +++++++++++++++++++++-
 src/camel/providers/imapx/camel-imapx-folder.h   |    2 +
 src/camel/providers/imapx/camel-imapx-provider.c |    4 +-
 src/camel/providers/imapx/camel-imapx-settings.c |   65 +++++++++++++++
 src/camel/providers/imapx/camel-imapx-settings.h |    5 +
 5 files changed, 164 insertions(+), 3 deletions(-)
---