# HG changeset patch
# User Daniel O'Connor <darius@dons.net.au>
# Date 1462349912 -34200
# Node ID 71d1f7a5dc3c56bb5dcb5477fb38592175e50188
# Parent  36b9ff5612281c53a94d6af225e48047c270fdb3# Parent  1d5dcaa3b07de16d4ebf982ca3a11aab088bc607
merge

diff -r 1d5dcaa3b07d -r 71d1f7a5dc3c .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed May 04 17:48:32 2016 +0930
@@ -0,0 +1,4 @@
+.*~
+.*\.pyc
+.*\.pdf
+.*\.mid