# HG changeset patch
# User matthewreed
# Date 2015-12-19 18:30:40
# Node ID 290bcdb4868e6e5031228a516ef309ad116098cc
# Parent  860001bb7681d411d6b98bd82458a967d96e789e
# Parent  a8dc1992dd1a3f505aaa1cb6f57bdd741017a161

Merge

diff --git a/.hgignore b/.hgignore
new file mode 100644
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,5 @@
+# use glob syntax.
+syntax: glob
+
+*.o
+build/*