Changeset c6a1e8a for src/main.cc

Timestamp:

Jun 5, 2019, 8:36:48 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

866545b

Parents:

67130fe (diff), 3cd5fdd (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:

fix conflicit

File:

• src/main.cc (modified) (2 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  3 17:35:59 2019
-// Update Count     : 600
+// Last Modified On : Wed Jun  5 20:35:13 2019
+// Update Count     : 601
 //
 
@@ -406 +406 @@
 
 
-static const char optstring[] = ":hlLmNn:pP:S:twW:D:F:";
+static const char optstring[] = ":hlLmNnpP:S:twW:D:F:";
 
 enum { PreludeDir = 128 };