Skip to content

Commit

Permalink
Merge pull request #855 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@95e975300e
  • Loading branch information
cazfi committed Jun 6, 2024
2 parents 61049d6 + b7cab48 commit 7495889
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 86 deletions.
8 changes: 0 additions & 8 deletions freeciv/apply_patches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
# https://osdn.net/projects/freeciv/ticket/?????
# https://redmine.freeciv.org/issues/???
#
# 0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
# Savegame resources loading fix
# RM #463
# 0049-Trigger-action-system-when-client-requests-activity-.patch
# Activity action fix (esp. Pillage)
# osdn #57670
# 0048-Handle-CoastStrict-units-correctly-on-city-removal.patch
# Fix to unit placement after city destruction
# RM #525
Expand Down Expand Up @@ -59,8 +53,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0050-savegame-Fix-loading-invalid-resources-on-FoW-map"
"backports/0049-Trigger-action-system-when-client-requests-activity-"
"backports/0048-Handle-CoastStrict-units-correctly-on-city-removal"
"backports/0061-savegame-Correct-loading-last-turn-change-time"
"backports/0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-"
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion freeciv/version.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=3c41f4e1ac25fe1ff8b383740ebabfe044907c0b
FCREV=95e975300e39ba90c8a561d6cfef5f64f8e490f2

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.30"

Expand Down

0 comments on commit 7495889

Please sign in to comment.