Ignore:
Timestamp:
Jan 23, 2019, 4:52:16 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
a200795
Parents:
9b086ca (diff), 1d832f4 (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 cleanup-dtors

File:
1 moved

Legend:

Unmodified
Added
Removed
  • doc/theses/aaron_moss_PhD/phd/thesis.tex

    r9b086ca rcde3891  
    2121
    2222\usepackage{amsmath,amssymb,amstext} % Lots of math symbols and environments
    23 \usepackage[pdftex]{graphicx} % For including graphics N.B. pdftex graphics driver
     23% \usepackage[pdftex]{graphicx} % For including graphics N.B. pdftex graphics driver
     24\usepackage{graphicx}
     25
     26\usepackage{amsthm} % for theorem environment
     27\newtheorem{theorem}{Theorem}
     28
     29\usepackage{footmisc} % for double refs to the same footnote
    2430
    2531% Hyperlinks make it very easy to navigate an electronic document.
     
    2834% Use the "hyperref" package
    2935% N.B. HYPERREF MUST BE THE LAST PACKAGE LOADED; ADD ADDITIONAL PKGS ABOVE
    30 \usepackage[pdftex,pagebackref=false]{hyperref} % with basic options
     36%\usepackage[pdftex,pagebackref=false]{hyperref} % with basic options
     37\usepackage[pagebackref=false]{hyperref}
    3138% N.B. pagebackref=true provides links back from the References to the body text. This can cause trouble for printing.
    3239
     
    5764        urlcolor=black}
    5865}{} % end of ifthenelse (no else)
     66
     67\input{cfa-macros} % must be loaded after hyperref
    5968
    6069% \usepackage[automake,toc,abbreviations]{glossaries-extra} % Exception to the rule of hyperref being the last add-on package
     
    118127\input{background}
    119128\input{generic-types}
     129\input{resolution-heuristics}
    120130\input{type-environment}
    121 \input{resolution-heuristics}
    122131\input{conclusion}
    123132
     
    139148\addcontentsline{toc}{chapter}{\textbf{References}}
    140149
    141 \bibliography{aaron-thesis}
     150\bibliography{pl}
    142151% Tip 5: You can create multiple .bib files to organize your references.
    143152% Just list them all in the \bibliogaphy command, separated by commas (no spaces).
Note: See TracChangeset for help on using the changeset viewer.