From: Jess <jessicatz.fairymeadow@gmail.com>
Date: Mon, 25 Aug 2014 22:09:02 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta
X-Git-Url: https://git.yukkurigames.com/?p=mlpccg-meta.git;a=commitdiff_plain;h=0460c3c46cd330bbae7043e42a8a490662bf1e60

Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta

Conflicts:
	main.py
	mlpccg/CardDb.pyc
	mlpccg/Clustering.py
	mlpccg/Clustering.pyc
	mlpccg/DeckList.pyc
	static/index.html
---

0460c3c46cd330bbae7043e42a8a490662bf1e60
diff --cc .gitignore
index 0000000,0000000..2f78cf5
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,2 @@@
++*.pyc
++
diff --cc mlpccg/CardDb.pyc
index ec143fa,43053dc..0000000
deleted file mode 100644,100644
Binary files differ
diff --cc mlpccg/Clustering.pyc
index 018b492,ddaa61a..0000000
deleted file mode 100644,100644
Binary files differ
diff --cc mlpccg/DeckList.pyc
index 29d8135,92c4384..0000000
deleted file mode 100644,100644
Binary files differ
diff --cc mlpccg/__init__.pyc
index 35dc891,35dc891..0000000
deleted file mode 100644,100644
Binary files differ