diff options
| author | Pete Woods <pete.woods@canonical.com> | 2013-08-21 16:04:53 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-08-21 16:04:53 +0000 |
| commit | 933deb6d32c36e8bf6db23d5673982cab788337a (patch) | |
| tree | be808298ec80ca3dc6d73309ac9e1e7024ee7950 /doc/reference | |
| parent | 94fef3bf0ca765544ef93f4a6cd38684b3ccf02e (diff) | |
| parent | 046f655a8859e2e3eaa6015fc2ecd226c8b46b1f (diff) | |
| download | ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.gz ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.bz2 ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.zip | |
Re-merge the consolidate branch, but with additional bugfix.
Approved by Sebastien Bacher, PS Jenkins bot.
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/Makefile.am | 3 | ||||
| -rw-r--r-- | doc/reference/messaging-menu-docs.xml.in | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 814a939..3993b41 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -11,8 +11,7 @@ HFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.h CFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.c IGNORE_HFILES= \ - indicator-messages-service.h \ - gtupleaction.h + indicator-messages-service.h INCLUDES=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS) GTKDOC_LIBS=$(top_builddir)/libmessaging-menu/libmessaging-menu.la diff --git a/doc/reference/messaging-menu-docs.xml.in b/doc/reference/messaging-menu-docs.xml.in index 742d37b..4c1cec1 100644 --- a/doc/reference/messaging-menu-docs.xml.in +++ b/doc/reference/messaging-menu-docs.xml.in @@ -18,7 +18,8 @@ <chapter> <title>API Reference</title> - <xi:include href="xml/messaging-menu.xml"/> + <xi:include href="xml/messaging-menu-app.xml" /> + <xi:include href="xml/messaging-menu-message.xml" /> </chapter> <chapter id="object-tree"> |