blitzmann 03212be54a Merge branch 'master' into test-3 ...

# Conflicts:
#	eos/capSim.py
#	eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
#	eos/effects/warpdisruptsphere.py

2018-03-25 03:03:59 -04:00

..

db

Merge remote-tracking branch 'origin/master' into test-3

2018-02-24 02:03:29 -05:00

effects

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

graph

Partial fix for #1430

2018-02-24 19:01:54 -05:00

saveddata

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

__init__.py

Roll up #967 and #974

2017-02-08 13:12:54 -08:00

capSim.py

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

config.py

Use a special dev database for py3 branch

2018-02-14 01:16:49 -05:00

effectHandlerHelpers.py

Fixed some missing chrome tab stuff, as well as more conversion issues

2017-06-13 15:18:40 -04:00

enum.py

Convert old style classes to new

2017-02-08 23:06:39 -08:00

eqBase.py

Tox fixes

2017-02-09 00:59:22 -08:00

events.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

gamedata.py

Remove old py<2.6 OrderedDict compat module

2017-11-25 22:40:23 -05:00

lgpl.txt

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

modifiedAttributeDict.py

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00