# HG changeset patch
# User Scott Morrison <scott@tqft.net>
# Date 1323580071 28800
# Node ID ceed680b7f4202a3228e30be8d6520d02e2856c9
# Parent  341c2a09f9a8be937b14ab2665d3341d84769449# Parent  b07e2becdd5879fab9e36b84ccfac672c578f4c6
Automated merge with https://tqft.net/hg/blob

diff -r 341c2a09f9a8 -r ceed680b7f42 diagrams/tempkw/morita1.pdf
Binary file diagrams/tempkw/morita1.pdf has changed
diff -r 341c2a09f9a8 -r ceed680b7f42 diagrams/tempkw/morita2.pdf
Binary file diagrams/tempkw/morita2.pdf has changed
diff -r 341c2a09f9a8 -r ceed680b7f42 diagrams/tempkw/morita3.pdf
Binary file diagrams/tempkw/morita3.pdf has changed
diff -r 341c2a09f9a8 -r ceed680b7f42 diagrams/tempkw/vcone.pdf
Binary file diagrams/tempkw/vcone.pdf has changed
diff -r 341c2a09f9a8 -r ceed680b7f42 text/appendixes/comparing_defs.tex
--- a/text/appendixes/comparing_defs.tex	Fri Dec 09 18:43:11 2011 -0800
+++ b/text/appendixes/comparing_defs.tex	Sat Dec 10 21:07:51 2011 -0800
@@ -661,7 +661,7 @@
 \end{figure}
 
 Given 1-morphisms $a$, $b$ and $c$ of $D$, we define the associator from $(a\bullet b)\bullet c$ to $a\bullet(b\bullet c)$
-as in Figure \nn{like triangle 4.a, but more general; use three colors as in that fig}.
+as in Figure \ref{fig:associator}.
 This is just a reparameterization of the pinched product $(a\bullet b\bullet c)\times I$ of $\cC$.
 \begin{figure}[t]
 $$