# HG changeset patch
# User Scott Morrison <scott@tqft.net>
# Date 1295134357 28800
# Node ID a36bd5f3ba6e868498ac548a8f06eee654516e0b
# Parent  f23a9878dbfd805b60482445d1157ae259d3b419# Parent  741fed9522cf9acdf9c5524835f5ea0cc09ae9c6
Automated merge with https://tqft.net/hg/blob/

diff -r 741fed9522cf -r a36bd5f3ba6e blob_changes_v2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/blob_changes_v2	Sat Jan 15 15:32:37 2011 -0800
@@ -0,0 +1,14 @@
+Summary of changes to "The Blob Complex" for version 2
+--------------------------------
+
+All changes are relatively minor.
+
+- terminology change: "topological n-cat" --> "disk-like n-cat"
+- terminology change: "plain n-cat" --> "ordinary n-cat"
+- add two citations (U. Tillman, R. Brown for n-fold categories)
+- added that action in last n-category axiom should be compatible with action in first axiom
+- added summary of n-cat data and properties
+- added mention of (n+1)-cat of sphere modules to the intro
+- added discussion of n-cat nomenclature to the intro
+
+