← Back to branch summary

~armagetronad-dev/armagetronad/0.4-armagetronad

~armagetronad-dev/armagetronad/0.4-armagetronad

Viewing all changes in revision 3185.

Committer: Manuel Moos
Date: 2020-09-11 04:26:02 UTC
mfrom: (3184.1.5 master)
Revision ID: manuel@moosnet.de-20200911042602-20zakdjqo7jv5dxi

Merge from legacy_0.2.9 with adaptions

See merge request armagetronad/armagetronad!98

files modified:
batch/git_merge_safe_sources.sh

docker/build/context/portable/build

docker/deploy/targets.sh.in

docker/images/armabuild/Dockerfile.proto

docker/images/armabuild/build_libsdl.sh

docker/images/armabuild/build_libsdl_image.sh

docker/images/armabuild_32.digest

docker/images/armabuild_64.digest

docker/images/armadeb_64.digest

docker/images/armadeploy_64.digest

docker/scripts/setup_ci_variables_test.sh

Show diffs side-by-side

added added

removed removed

batch/git_merge_safe_sources.sh

docker/build/context/portable/build

docker/deploy/targets.sh.in

docker/images/armabuild/Dockerfile.proto

docker/images/armabuild/build_libsdl.sh

docker/images/armabuild/build_libsdl_image.sh

docker/images/armabuild_32.digest

docker/images/armabuild_64.digest

docker/images/armadeb_64.digest

docker/images/armadeploy_64.digest

docker/scripts/setup_ci_variables_test.sh

Older »