Changeset 76934fb for src/Tuples/module.mk

Timestamp:

Jun 1, 2015, 12:55:33 PM (11 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

6db50d5

Parents:

46cbfe1 (diff), db82596 (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:

Merge branch 'master' into labels

File:

• src/Tuples/module.mk (modified) (2 diffs)

src/Tuples/module.mk

@@ -4 +4 @@
         Tuples/TupleAssignment.cc \
         Tuples/FunctionChecker.cc \
-        Tuples/NameMatcher.cc \
+        Tuples/NameMatcher.cc
+
 #       Tuples/MultipleAssign.cc \
 #       Tuples/FlattenTuple.cc \
@@ -10 +11 @@
 #       Tuples/FixReturn.cc \
 #       Tuples/MassAssignment.cc \
-#       Tuples/TupleFixer.cc \
-        $(NULL)
-
+#       Tuples/TupleFixer.cc