[couchdb-glib: 6/6] Fixed conflict

[Rodrigo Moya <rodrigo src gnome org>]

commit 75597483f5c918baf097ae22c9a0a7e0ce83f2ab
Merge: 7c90a1b 7a0e84e
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Jan 7 14:43:33 2010 +0100

    Fixed conflict

 .gitignore                              |   13 ++
 Makefile.am                             |    2 +
 configure.ac                            |    7 +
 couchdb-glib/Makefile.am                |   83 +++++++++++---
 couchdb-glib/couchdb-database-info.c    |   32 +++---
 couchdb-glib/couchdb-database-info.h    |   20 ++--
 couchdb-glib/couchdb-document-contact.c |  190 +++++++++++++++---------------
 couchdb-glib/couchdb-document-contact.h |  172 ++++++++++++++--------------
 couchdb-glib/couchdb-document-info.c    |   24 ++--
 couchdb-glib/couchdb-document-info.h    |   10 +-
 couchdb-glib/couchdb-document.c         |   84 +++++++-------
 couchdb-glib/couchdb-document.h         |   68 ++++++------
 couchdb-glib/couchdb-struct-field.c     |   62 +++++-----
 couchdb-glib/couchdb-struct-field.h     |   42 ++++----
 couchdb-glib/couchdb-types.h            |   10 +-
 couchdb-glib/couchdb.c                  |  155 +++++++++++++++++--------
 couchdb-glib/couchdb.h                  |   42 ++++----
 couchdb-glib/dbwatch.c                  |    8 +-
 couchdb-glib/dbwatch.h                  |    4 +-
 couchdb-glib/oauth.c                    |    2 +-
 m4/introspection.m4                     |   92 +++++++++++++++
 tests/test-couchdb-glib.c               |   22 ++--
 tests/test-list-databases.c             |   14 +-
 tests/test-oauth.c                      |    4 +-
 24 files changed, 691 insertions(+), 471 deletions(-)
---