From: Harald Steinlechner <haraldsteinlechner@gmail.com>
Date: Tue, 17 Apr 2012 11:58:57 +0000 (+0200)
Subject: Merge branch 'master' of wien.tomnetworks.com:mate
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=9942a779613934ef0127361ac742fd5a23a5ffaf;hp=a02b7201d043e4583e0a27c78a5f8831b60e90f2;p=mate.git

Merge branch 'master' of wien.tomnetworks.com:mate
---

diff --git a/.gitignore b/.gitignore
index 874b14d..9bca9cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.hi
+*.o
 *.class
 mate
 tags
+*.swp
 *_stub.c
 *_stub.h
diff --git a/scratch/.ScratchHS.hs.swp b/scratch/.ScratchHS.hs.swp
deleted file mode 100644
index 513731c..0000000
Binary files a/scratch/.ScratchHS.hs.swp and /dev/null differ