Skip to content

Commit

Permalink
Merge pull request #754 from cazfi/srvup
Browse files Browse the repository at this point in the history
  • Loading branch information
cazfi authored Sep 29, 2023
2 parents bed86d7 + c46e46a commit c8f05ac
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 590 deletions.
12 changes: 4 additions & 8 deletions freeciv/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@
# osdn #????? is ticket in freeciv.org tracker:
# https://osdn.net/projects/freeciv/ticket/?????
#
# 0009-Fix-handling-of-invalid-player-flag-on-savegame-load.patch
# Savegame loading fix
# osdn #48563
# 0016-Introduce-fc_strncmp.patch
# Update baseline for some freeciv-web patches
# osdn #48420
# 0022-AI-Set-countdown-correctly-if-senate-blocks-war-comp.patch
# AI assert failure fix
# osdn #47786
# 0022-Lua-Fix-Unit-is_on_possible_city_tile.patch
# Fix finding cities from huts
# osdn #48582
# 0021-Meson-Replace-boolean-ruledit-option-with-tools-arra.patch
# Refactored meson options
# osdn #48700

# Not in the upstream Freeciv server
# ----------------------------------
Expand All @@ -39,10 +36,9 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0009-Fix-handling-of-invalid-player-flag-on-savegame-load"
"backports/0016-Introduce-fc_strncmp"
"backports/0022-AI-Set-countdown-correctly-if-senate-blocks-war-comp"
"backports/0022-Lua-Fix-Unit-is_on_possible_city_tile"
"backports/0021-Meson-Replace-boolean-ruledit-option-with-tools-arra"
"meson_webperimental"
"metachange"
"text_fixes"
Expand Down

This file was deleted.

Loading

0 comments on commit c8f05ac

Please sign in to comment.