Khopa 5bd4c00257 Merge branch 'develop_2_4_x' into develop
# Conflicts:
#	changelog.md
#	game/db.py
#	game/navmesh.py
#	game/operation/operation.py
#	game/theater/conflicttheater.py
#	game/theater/controlpoint.py
#	game/theater/start_generator.py
#	game/theater/theatergroundobject.py
#	game/threatzones.py
#	game/version.py
#	gen/aircraft.py
#	gen/airsupportgen.py
#	gen/fleet/carrier_group.py
#	gen/flights/ai_flight_planner.py
#	gen/flights/ai_flight_planner_db.py
#	gen/flights/flightplan.py
#	gen/flights/waypointbuilder.py
#	gen/groundobjectsgen.py
#	gen/kneeboard.py
#	pydcs
#	pydcs_extensions/f22a/f22a.py
#	qt_ui/uiconstants.py
#	qt_ui/widgets/combos/QAircraftTypeSelector.py
#	qt_ui/widgets/map/QLiberationMap.py
#	qt_ui/windows/QUnitInfoWindow.py
#	qt_ui/windows/mission/flight/payload/QPylonEditor.py
#	qt_ui/windows/settings/QSettingsWindow.py
2021-03-21 18:50:50 +01:00
..
2020-12-19 11:47:00 -08:00
2021-02-22 16:52:53 -08:00
2020-08-31 13:01:05 -07:00
2021-02-13 13:09:47 -08:00
2021-02-21 23:01:05 +01:00
2021-02-12 20:10:45 -08:00
2020-12-24 13:50:29 -08:00
2020-06-29 17:31:47 -04:00
2020-12-24 13:50:29 -08:00
2020-12-24 13:50:29 -08:00
2019-03-27 08:47:29 +02:00
2019-07-03 23:35:22 +02:00
2020-12-24 13:50:29 -08:00
2020-08-20 22:14:59 +02:00
2020-12-24 13:50:29 -08:00