Changeset d0c91a6 for src/main.cc

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (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 jenkins-sandbox

File:

• src/main.cc (modified) (1 diff)

src/main.cc

@@ -487 +487 @@
                         resolvep = true;
                         break;
-                        case 'R':                                                                               // dump resolv-proto instance
+                  case 'R':                                                                             // dump resolv-proto instance
                         resolvprotop = true;
                         break;