Changeset 182fe1e for doc/LaTeXmacros

Timestamp:

Aug 1, 2016, 9:07:35 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

79f64f1

Parents:

c45170a (diff), 08061589 (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:

update switch documentation and LaTeX macros

File:

• doc/LaTeXmacros/common.tex (modified) (2 diffs)

doc/LaTeXmacros/common.tex

@@ -10 +10 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Sat Apr  9 10:06:17 2016
+<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Aug  1 08:57:17 2016
 %% Update Count     : 223
+=======
+%% Last Modified By : 
+%% Last Modified On : Sun Jul 31 07:22:50 2016
+%% Update Count     : 207
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -227 +233 @@
         morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
                 _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
 }%