[gnome-keyring/dbus-api] Build docs for the secrets API.
- From: Stefan Walter <stefw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-keyring/dbus-api] Build docs for the secrets API.
- Date: Fri, 26 Jun 2009 17:45:12 +0000 (UTC)
commit 1251b19def3e70bd9cfb5ae81afceaa2df666caa
Author: Stef Walter <stef memberwebs com>
Date: Sat Jun 20 01:04:12 2009 +0000
Build docs for the secrets API.
docs/reference/secrets/secrets-docs.sgml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/docs/reference/secrets/secrets-docs.sgml b/docs/reference/secrets/secrets-docs.sgml
index c491b91..ce1a209 100644
--- a/docs/reference/secrets/secrets-docs.sgml
+++ b/docs/reference/secrets/secrets-docs.sgml
@@ -403,7 +403,10 @@
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</index>
+<<<<<<< HEAD:docs/reference/secrets/secrets-docs.sgml
-->
+=======
+>>>>>>> Build docs for the secrets API.:docs/reference/secrets/secrets-docs.sgml
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
</book>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]