mirror of
https://github.com/dcs-retribution/dcs-retribution.git
synced 2025-11-10 15:41:24 +00:00
5bd4c00257
# 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