# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1356124633 18000
# Node ID 6098633219726eb467dec7302f93ae7ff6fbee64
# Parent  93516992ee34b4abad8c1b857d7161cc5afed439# Parent  f366e9948259f48c9743ee010c0c0b89c5a619db
maint: merge away extra head on default branch

diff -r 93516992ee34 -r 609863321972 configure.ac
diff -r 93516992ee34 -r 609863321972 doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Fri Dec 21 22:12:29 2012 +0100
+++ b/doc/interpreter/Makefile.am	Fri Dec 21 16:17:13 2012 -0500
@@ -289,7 +289,7 @@
 clean-local:
 	rm -rf t2d_cache
 
-DISTCLEANFILES = $(BUILT_TEXINFOS) doc-cache
+DISTCLEANFILES = $(BUILT_TEXINFOS)
 
-MAINTAINERCLEANFILES = $(BUILT_IMAGES)
+MAINTAINERCLEANFILES = $(BUILT_IMAGES) doc-cache
 
diff -r 93516992ee34 -r 609863321972 doc/interpreter/mk_doc_cache.m
diff -r 93516992ee34 -r 609863321972 m4/acinclude.m4
diff -r 93516992ee34 -r 609863321972 scripts/Makefile.am