emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 1d3020908b: Merge from origin/emacs-28


From: Eli Zaretskii
Subject: master 1d3020908b: Merge from origin/emacs-28
Date: Sat, 1 Jan 2022 08:39:01 -0500 (EST)

branch: master
commit 1d3020908b4e4ff398c3faed9321aa4932fbaad1
Merge: 31fefef4a2 58b0ada20b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    58b0ada20b Update more copyright years
---
 config.bat                | 2 +-
 etc/tutorials/TUTORIAL.he | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.bat b/config.bat
index e4332cd326..29742eec52 100644
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,7 @@
 @echo off
 rem   ----------------------------------------------------------------------
 rem   Configuration script for MSDOS
-rem   Copyright (C) 1994-1999, 2001-2021 Free Software Foundation, Inc.
+rem   Copyright (C) 1994-1999, 2001-2022 Free Software Foundation, Inc.
 
 rem   This file is part of GNU Emacs.
 
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index fc4b769599..26a9d06e45 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -1015,7 +1015,7 @@ find-file.
 גירסה זו של השיעור הינה חלק מחבילת GNU Emacs. היא מוגנת בזכויות יוצרים
 וניתנת להעתקה והפצת עותקים בתנאים מסויימים כדלקמן:
 
-                       Copyright (C) 2010-2021 Free Software Foundation, Inc.
+                       Copyright (C) 2010-2022 Free Software Foundation, Inc.
 
 ‏GNU Emacs הינו תכנה חפשית; זכותכם להפיצו ו\או לשנותו בכפוף לתנאי
 הרשיון GNU General Public License, כפי שהוא יוצא לאור ע״י Free



reply via email to

[Prev in Thread] Current Thread [Next in Thread]