From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 30 Nov 2016 19:39:02 +0000 (+0100)
Subject: Merge branch 'master' of ygdrassil:ri1617
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=2ecf4c15bbff815f79c64b076c3734c736908d9f;p=ri1617.git

Merge branch 'master' of ygdrassil:ri1617
---

2ecf4c15bbff815f79c64b076c3734c736908d9f
diff --cc .gitignore
index 00d77b4,a7b5568..bf5c704
--- a/.gitignore
+++ b/.gitignore
@@@ -3,5 -3,4 +3,6 @@@
  *.bbl
  *.blg
  *.pdf
 +*.fmt
 +*.mlog
+ *.out