Changeset b1e63ac5 for .gitignore

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

• .gitignore (modified) (3 diffs)

.gitignore

@@ -13 +13 @@
 libcfa/Makefile
 src/Makefile
-version
+/version
 
 # genereted by premake
@@ -31 +31 @@
 
 src/prelude/builtins.cf
-src/prelude/builtins.c
+src/prelude/gcc-builtins.cf
+src/prelude/gcc-builtins.c
 src/prelude/extras.cf
 src/prelude/bootloader.c
 src/libcfa/libcfa-prelude.c
 
-# generated by bison and lex from cfa.yy and lex.ll, respectively
+# generated by bison and lex from parser.yy and lex.ll
 src/Parser/parser.output
 src/Parser/lex.cc
@@ -42 +43 @@
 src/Parser/parser.h
 
+tools/prettyprinter/parser.output
+tools/prettyprinter/lex.cc
+tools/prettyprinter/parser.cc
+tools/prettyprinter/parser.h
+tools/prettyprinter/pretty
+tools/pretty
+
 # generated by xfig for user manual
 doc/user/Cdecl.tex