Changeset 3d5701e for libcfa/automake/missing

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve conflict

File:

• libcfa/automake/missing (modified) (1 diff, 1 prop)

libcfa/automake/missing

@@ -1 @@
-/usr/share/automake-1.15/missing
+#! /bin/sh
+# Tdelisle : having the Makefiles.in automatically regenerated causes problems
+#            when using multiple versions of automake, even if only on end user machines
+#            therefore I am disabling that feature by commenting this script
+exit 0