Merge branch 'master' into wx3

Conflicts: gui/characterEditor.py
2015-09-26 18:53:28 -04:00
parent c158cb076f c751544560
commit 0f8992432b
105 changed files with 508 additions and 234 deletions
--- a/gui/characterSelection.py
+++ b/gui/characterSelection.py
@@ -81,7 +81,6 @@ class CharacterSelection(wx.Panel):

        choice.Clear()
        charList = sChar.getCharacterList()
-        sChar.getCharacterList()
        picked = False

        for id, name, active in charList: