[couchdb-glib/wip/query-response: 7/7] Merge branch 'master' into wip/query-response
- From: Krzysztof Klimonda <kklimonda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [couchdb-glib/wip/query-response: 7/7] Merge branch 'master' into wip/query-response
- Date: Wed, 19 Jan 2011 13:02:08 +0000 (UTC)
commit 5e3bf742463dc460d7abfed0130a0b6d877c566e
Merge: e23dd58 b705bdd
Author: Krzysztof Klimonda <kklimonda syntaxhighlighted com>
Date: Wed Jan 19 14:01:28 2011 +0100
Merge branch 'master' into wip/query-response
Conflicts:
couchdb-glib/couchdb-database.c
NEWS | 10 ++++++++++
configure.ac | 2 +-
couchdb-glib/Makefile.am | 4 ++--
desktopcouch-glib/Makefile.am | 4 ++--
doc/reference/couchdb-glib-docs.sgml | 9 +++++++--
5 files changed, 22 insertions(+), 7 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
