Merge pull request #83 from DeForce/develop

Release to master
DeForce · Oct 9, 2016 · ee522b2 · ee522b2
2 parents 44c9c14 + c50efc1
commit ee522b2
Show file tree

Hide file tree

Showing 117 changed files with 1,600 additions and 1,478 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,10 @@
 *.pyc
-.idea/*
+.idea/*
+/logs
+levels.db*
+/build
+/dist
+/libs
+/conf
+*.spec
+*.log
diff --git a/conf/blacklist.cfg b/conf/blacklist.cfg
diff --git a/conf/c2b.cfg b/conf/c2b.cfg
diff --git a/conf/chat_modules.cfg b/conf/chat_modules.cfg
diff --git a/conf/config.cfg b/conf/config.cfg
diff --git a/conf/df.cfg b/conf/df.cfg
diff --git a/conf/goodgame.cfg b/conf/goodgame.cfg
diff --git a/conf/levels.cfg b/conf/levels.cfg
diff --git a/conf/logger.cfg b/conf/logger.cfg
diff --git a/conf/mentions.cfg b/conf/mentions.cfg
diff --git a/conf/messaging.cfg b/conf/messaging.cfg
diff --git a/conf/sc2tv.cfg b/conf/sc2tv.cfg
diff --git a/conf/translations.cfg b/conf/translations.cfg
diff --git a/conf/twitch.cfg b/conf/twitch.cfg
diff --git a/conf/webchat.cfg b/conf/webchat.cfg