Merge branch 'freedoom:master' into bosscube-offsetfix

2025-09-01 13:25:46 -04:00 · 2021-08-28 00:55:35 -07:00 · 2021-08-28 00:55:35 -07:00 · cbd6768b1f
commit cbd6768b1f
parent e679aeb8c6 060aa0492d
18 changed files with 2 additions and 2 deletions
--- a/COPYING.adoc
+++ b/COPYING.adoc
@ -1,4 +1,4 @@
-Copyright © 2001-2020
+Copyright © 2001-2021
 Contributors to the Freedoom project.  All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/graphics/stkeys0.png
+++ b/graphics/stkeys0.png
--- a/graphics/stkeys1.png
+++ b/graphics/stkeys1.png
--- a/graphics/stkeys2.png
+++ b/graphics/stkeys2.png
--- a/graphics/stkeys3.png
+++ b/graphics/stkeys3.png
--- a/graphics/stkeys4.png
+++ b/graphics/stkeys4.png
--- a/graphics/stkeys5.png
+++ b/graphics/stkeys5.png
--- a/graphics/text/create_caption
+++ b/graphics/text/create_caption
@ -11,7 +11,7 @@ import os
 font = ImageFont.load_default()


-txt1 = "© 2001-2020"
+txt1 = "© 2001-2021"
 txt2 = os.environ["VERSION"]
 background_image = Image.open(sys.argv[1])
 background_image.load()
--- a/levels/map25.wad
+++ b/levels/map25.wad
--- a/patches/w46_37.png
+++ b/patches/w46_37.png
--- a/patches/w46_38.png
+++ b/patches/w46_38.png
--- a/patches/w46_39.png
+++ b/patches/w46_39.png
--- a/sprites/bkeya0.png
+++ b/sprites/bkeya0.png
--- a/sprites/bkeyb0.png
+++ b/sprites/bkeyb0.png
--- a/sprites/rkeya0.png
+++ b/sprites/rkeya0.png
--- a/sprites/rkeyb0.png
+++ b/sprites/rkeyb0.png
--- a/sprites/ykeya0.png
+++ b/sprites/ykeya0.png
--- a/sprites/ykeyb0.png
+++ b/sprites/ykeyb0.png