From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 19 May 2008 20:46:09 +0000 (+0000)
Subject: Merge branch 'master' of sputnick@git.quassel-irc.org:quassel
X-Git-Tag: 0.3.0~415
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d9b51624b0e22629e574a88473a9b78a65314e91;hp=ca012263afaeb34d591f206c52e006e839fdb815

Merge branch 'master' of sputnick@git.quassel-irc.org:quassel
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b25c15b8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~