# HG changeset patch # User Scott Morrison # Date 1289792627 28800 # Node ID f699e8381c4322d0edbac4e1b4e9a02f54ea2f99 # Parent 53aed9fdfcd9cc32808e0e45a6b6e378dc5108a6# Parent 2906548b2a95af65c2ba9b03ddd694ba00b3a855 Automated merge with https://tqft.net/hg/blob/ diff -r 53aed9fdfcd9 -r f699e8381c43 pnas/build.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pnas/build.xml Sun Nov 14 19:43:47 2010 -0800 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 53aed9fdfcd9 -r f699e8381c43 pnas/pnas.tex --- a/pnas/pnas.tex Sun Nov 14 18:33:03 2010 -0800 +++ b/pnas/pnas.tex Sun Nov 14 19:43:47 2010 -0800 @@ -96,7 +96,7 @@ %% For titles, only capitalize the first letter %% \title{Almost sharp fronts for the surface quasi-geostrophic equation} -\title{$n$-categories, colimits and the blob complex} +\title{Higher categories, colimits and the blob complex} %% Enter authors via the \author command.