summaryrefslogtreecommitdiff
path: root/doc/emacs/frames.texi
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 /doc/emacs/frames.texi
parent772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff)
parent2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff)
downloademacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
Diffstat (limited to 'doc/emacs/frames.texi')
-rw-r--r--doc/emacs/frames.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 082de3796c1..d1fd4d0446e 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1,5 +1,5 @@
@c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2016 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2017 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Frames