Khopa cf583bcd55 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	game/db.py
#	game/game.py
#	game/income.py
#	game/theater/theatergroundobject.py
#	game/version.py
#	qt_ui/windows/finances/QFinancesMenu.py

2021-01-05 19:50:29 +01:00

..

QBuildingInfo.py

chore: syntax cleaning and redundant variable cleanup

2020-11-20 02:57:23 -08:00

QGroundObjectMenu.py

Merge branch 'master' into develop

2021-01-05 19:50:29 +01:00

QGroundObjectReplacementMenu.py

Added possibility to repair SAM sites (WIP)

2020-08-23 13:43:33 +02:00