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

diff --cc .gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2f78cf5b66514f2506d9af5f3dadf3dee7aa6d9f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.gitignore
@@@ -1,0 -1,0 +1,2 @@@
++*.pyc
++

diff --cc mlpccg/CardDb.pyc
index ec143fa95bbe2ade83e07e6f3c30d307ddb0bd61,43053dc21b008fb3c7065c6bb4c8302f42f1dc5a..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc mlpccg/Clustering.pyc
index 018b492d4957a06a2bf13909d9d78e340de2259d,ddaa61a1a5205e6598d77a2324085aee0abab3fc..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc mlpccg/DeckList.pyc
index 29d8135aace140b5647144bd502a13ba517f362b,92c4384de00b4f61c2637eef4583283bca91ce79..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ

diff --cc mlpccg/__init__.pyc
index 35dc89165c8b13b9b120b3b9d6b98498fa3224f6,35dc89165c8b13b9b120b3b9d6b98498fa3224f6..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ