Merge branch 'master' into wx3

Browse Source

Conflicts:
	gui/characterEditor.py

...

This commit is contained in:

blitzmann

2015-09-26 18:53:28 -04:00

parent c158cb076f c751544560

commit 0f8992432b

105 changed files with 508 additions and 234 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

staticdata/eve.db

Binary file not shown.