From: Matt McCutchen <matt@mattmccutchen.net>
Date: Sun, 12 Feb 2012 06:46:46 +0000 (-0800)
Subject: Merge branch 'master' into popl2012
X-Git-Url: https://mattmccutchen.net/match/match.git/commitdiff_plain/767b3c0c14a2120679b132e858e23ba1cbf65b8e?hp=1a8dd46727a20bad8164af908ad027eac6abc6cc

Merge branch 'master' into popl2012
---

diff --git a/paper/.gitignore b/paper/.gitignore
new file mode 100644
index 0000000..cf5cd6d
--- /dev/null
+++ b/paper/.gitignore
@@ -0,0 +1,6 @@
+/flow.fig.bak
+/flow.pdf
+/flow.pdf_t
+/paper.aux
+/paper.log
+/paper.pdf