[Xfce4-commits] <parole:master> Merge branch 'master' of ssh://git.xfce.org/apps/parole

[Simon Steinbeiss]

Updating branch refs/heads/master
         to b41f78fe3f6880dcd3ae677a4408d69f89c0d187 (commit)
       from 0278f70240662b082666e4f20a89070dba771929 (commit)

commit b41f78fe3f6880dcd3ae677a4408d69f89c0d187
Merge: 0278f70 adea74f
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Mon Aug 20 16:18:47 2012 +0200

    Merge branch 'master' of ssh://git.xfce.org/apps/parole

commit adea74f28cdd9cae7435056c1e4de3dd79c4b391
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Aug 20 09:05:07 2012 -0400

    Fixed distribution building for --enable-gtk-doc.

 docs/plugin-api/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am
index 117a40d..e7b022b 100644
--- a/docs/plugin-api/Makefile.am
+++ b/docs/plugin-api/Makefile.am
@@ -84,5 +84,7 @@ EXTRA_DIST=
 endif
 
 EXTRA_DIST +=			\
-	version.xml.in
+	version.xml.in			\
+	$(DOC_MAIN_SGML_FILE)	\
+	parole-plugins-tut.sgml