eichhornchen 7f63ab2357 Merge branch 'master' into 'familiars' ...

# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py

2021-01-05 10:27:39 +01:00

..

__init__.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

creditsdisplay.py

linting

2020-12-31 15:00:20 +01:00

display_manager.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

display.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

logsdisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

mapdisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

menudisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

messagedisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

statsdisplay.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00

texturepack.py

Merge branch 'master' into 'familiars'

2021-01-05 10:27:39 +01:00