Changeset 35a4b94d


Ignore:
Timestamp:
Jan 18, 2018, 2:59:06 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
d27f609
Parents:
721c3146 (diff), 5eba8ce (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' of plg2:software/cfa/cfa-cc

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • doc/proposals/concurrency/text/frontpgs.tex

    r721c3146 r35a4b94d  
    3939        \vspace*{2.0cm}
    4040
    41         Waterloo, Ontario, Canada, 2017 \\
     41        Waterloo, Ontario, Canada, 2018 \\
    4242
    4343        \vspace*{1.0cm}
    4444
    45         \copyright\ Thierry Delisle 2017 \\
     45        \copyright\ Thierry Delisle 2018 \\
    4646        \end{center}
    4747\end{titlepage}
     
    154154% \newpage
    155155
     156% L I S T   O F   T A B L E S
     157% -----------------------------
     158\addcontentsline{toc}{chapter}{List of Acronyms}
     159\printglossary[type=\acronymtype,title={List of Acronyms}]
     160\cleardoublepage
     161\phantomsection         % allows hyperref to link to the correct page
     162
    156163% Change page numbering back to Arabic numerals
    157164\pagenumbering{arabic}
  • doc/proposals/concurrency/thesis.tex

    r721c3146 r35a4b94d  
    125125\input{future}
    126126
    127 \clearpage
    128 \printglossary[type=\acronymtype]
    129 \printglossary
    130127
    131128\clearpage
     129
     130% B I B L I O G R A P H Y
     131% -----------------------------
     132\addcontentsline{toc}{chapter}{Bibliography}
    132133\bibliographystyle{plain}
    133134\bibliography{pl,local}
     135\cleardoublepage
     136\phantomsection         % allows hyperref to link to the correct page
     137
     138% G L O S S A R Y
     139% -----------------------------
     140\addcontentsline{toc}{chapter}{Glossary}
     141\printglossary
     142\cleardoublepage
     143\phantomsection         % allows hyperref to link to the correct page
    134144
    135145
  • doc/proposals/concurrency/version

    r721c3146 r35a4b94d  
    1 0.11.391
     10.11.403
  • tools/repeat.c

    r721c3146 r35a4b94d  
    2626                if(print_iterations) {
    2727                        printf("\r%d / %d", i, repetitions);
     28                        fflush(stdout);
    2829                }
    2930                int retcode = run();
     
    4748        fprintf(out, "Repeat CMD N times\n\n");
    4849        fprintf(out, "\t-h,--help\tprint this usage message\n");
    49         fprintf(out, "\t-s\tstop on error\n");
    50         fprintf(out, "\t-i\toutput iterations instead of CMD stdout\n");
    51         fprintf(out, "\t-x\tprint CMD before running it\n");
     50        fprintf(out, "\t-s\t\tstop on error\n");
     51        fprintf(out, "\t-i\t\toutput iterations instead of CMD stdout\n");
     52        fprintf(out, "\t-x\t\tprint CMD before running it\n");
    5253        exit(code);
    5354}
Note: See TracChangeset for help on using the changeset viewer.