summaryrefslogtreecommitdiff
path: root/etc/tutorials/TUTORIAL.cn
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:10:47 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-01-01 01:10:47 -0800
commitbcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch)
treedc5dde303bce1fbe4f04300c3691cc1ee5874f43 /etc/tutorials/TUTORIAL.cn
parent772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
downloademacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz
emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.bz2
emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
Diffstat (limited to 'etc/tutorials/TUTORIAL.cn')
-rw-r--r--etc/tutorials/TUTORIAL.cn4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 28d71a5e514..fe8f500aafb 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -997,7 +997,7 @@ starting with the one written by Stuart Cracraft for the original Emacs.
This version of the tutorial is a part of GNU Emacs. It is copyrighted
and comes with permission to distribute copies on certain conditions:
- Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation,
+ Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation,
Inc.
This file is part of GNU Emacs.
@@ -1026,7 +1026,7 @@ using, writing, and sharing free software!
本篇指南是 GNU Emacs 的一部分,并允许在下列条件的约束下发行其拷贝:
- Copyright (C) 1985, 1996, 1998, 2001-2016 Free Software Foundation,
+ Copyright (C) 1985, 1996, 1998, 2001-2017 Free Software Foundation,
Inc.
本文件为 GNU Emacs 的一部分。