Changeset f80e021 for .gitignore


Ignore:
Timestamp:
Jun 30, 2016, 4:32:56 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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, with_gc
Children:
ea29e73
Parents:
1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r1b5c81ed rf80e021  
    3131# generated by bison and lex from cfa.yy and lex.ll, respectively
    3232src/Parser/parser.output
    33 
    34 # generated by latex
    35 *.aux
    36 *.bbl
    37 *.blg
    38 *.brf
    39 *.dvi
    40 *.idx
    41 *.ilg
    42 *.ind
    43 *.log
    44 *.out
    45 *.pdf
    46 *.ps
    47 *.toc
Note: See TracChangeset for help on using the changeset viewer.