From: John Ellson <ellson@research.att.com>
Date: Mon, 19 Sep 2016 18:16:05 +0000 (-0400)
Subject: merge changes except to features/common
X-Git-Tag: untagged-026b538d0dba6682fde7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec8a1812303950949a4bbef86f2afc27bbba75a4;p=graphviz

merge changes except to features/common
---

ec8a1812303950949a4bbef86f2afc27bbba75a4
diff --cc Makefile.am
index 3784dcf45,e40f40b42..09181e79e
--- a/Makefile.am
+++ b/Makefile.am
@@@ -38,12 -38,12 +38,12 @@@ $(top_builddir)/graphviz_version.h: con
  EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \
  	autogen.sh config/depcomp config/config.rpath \
  	builddate.h ast_common.h.in compat.h \
 -	Makeargs compat_getopt.h iffe config.iffe \
 +	Makeargs iffe config.iffe \
  	m4/README m4/iconv.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 \
- 	graphviz.7 Doxyfile.in Doxyfile features awk \
+ 	graphviz.7 Doxyfile.in Doxyfile awk \
  	config/config_perl.pl config/config_python.py \
  	config/config_ruby.rb config/config_tcl.tcl dot.demo  plugin.demo \
- 	macosx windows debian graphviz.vcproj graphviz.sln
+ 	macosx windows debian graphviz.sln
  
  .PHONY: rpm
  rpm: dist