Ignore:
Timestamp:
Apr 19, 2017, 10:15:45 AM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
cd348e7
Parents:
221c2de (diff), de4ce0e (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/generic_types/acmart.cls

    r221c2de r154fdc8  
    401401       \immediate\write\@auxout{\string\bibstyle{#1}}%
    402402     \fi}}
    403 \RequirePackage{graphicx, xcolor}
    404 \definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
    405 \definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
    406 \definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01}
    407 \definecolor[named]{ACMRed}{cmyk}{0,0.90,0.86,0}
    408 \definecolor[named]{ACMLightBlue}{cmyk}{0.49,0.01,0,0}
    409 \definecolor[named]{ACMGreen}{cmyk}{0.20,0,1,0.19}
    410 \definecolor[named]{ACMPurple}{cmyk}{0.55,1,0,0.15}
    411 \definecolor[named]{ACMDarkBlue}{cmyk}{1,0.58,0,0.21}
     403%\RequirePackage{graphicx, xcolor}
     404%\definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
     405%\definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
     406%\definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01}
     407%\definecolor[named]{ACMRed}{cmyk}{0,0.90,0.86,0}
     408%\definecolor[named]{ACMLightBlue}{cmyk}{0.49,0.01,0,0}
     409%\definecolor[named]{ACMGreen}{cmyk}{0.20,0,1,0.19}
     410%\definecolor[named]{ACMPurple}{cmyk}{0.55,1,0,0.15}
     411%\definecolor[named]{ACMDarkBlue}{cmyk}{1,0.58,0,0.21}
    412412\RequirePackage{geometry}
    413413\ifcase\ACM@format@nr
Note: See TracChangeset for help on using the changeset viewer.