Changeset 5e44ac2 for .gitignore

Timestamp:

Aug 15, 2018, 1:58:02 PM (8 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (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 demangler

File:

• .gitignore (modified) (2 diffs)

.gitignore

@@ -11 +11 @@
 stamp-h1
 /Makefile
-src/**/Makefile
-tools/**/Makefile
+**/Makefile
 /version
 
@@ -29 +28 @@
 
 # src executables, for lib and bin
-src/driver/as
-src/driver/cfa
-src/driver/cfa-cpp
-src/driver/cc1
+driver/as
+driver/cfa
+driver/cfa-cpp
+driver/cc1
 
-src/prelude/bootloader.c
-src/prelude/builtins.cf
-src/prelude/extras.cf
-src/prelude/gcc-builtins.cf
-src/prelude/gcc-builtins.c
-src/prelude/prelude.cf
-src/libcfa/libcfa-prelude.c
+libcfa/prelude/bootloader.c
+libcfa/prelude/builtins.cf
+libcfa/prelude/extras.cf
+libcfa/prelude/gcc-builtins.cf
+libcfa/prelude/gcc-builtins.c
+libcfa/prelude/prelude.cf
+libcfa/x64-debug/
+libcfa/x64-nodebug/
+libcfa/x64-nolib/
+libcfa/x86-debug/
+libcfa/x86-nodebug/
+libcfa/x86-nolib/
+libcfa/arm-debug/
+libcfa/arm-nodebug/
+libcfa/arm-nolib/
+
 
 # generated by bison and lex from parser.yy and lex.ll