scripts

commit: a698222f2491acb93a74560c9701ba8fd540c94c
parent: eb30387200ab1964fb6b285b14e7c4cf87a9720e
Author: lanodan <lanodan.delta@free.fr>
Date:   Sat, 15 Mar 2014 02:56:51 +0100

Merge branch 'master' of https://github.com/lanodan/scripts

Conflicts:
	IRCBot/.IRCBot.py.swp

Diffstat:
M
.gitignore
4
++--
D
.image.py.swo
0

D
IRCBot/.IRCBot.py.swp
0

3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-*.swp
-*.swo
+.*.swp
+.*.swo
diff --git a/.image.py.swo b/.image.py.swo
Binary files differ.
diff --git a/IRCBot/.IRCBot.py.swp b/IRCBot/.IRCBot.py.swp
Binary files differ.