summaryrefslogtreecommitdiff
path: root/nextstep
diff options
context:
space:
mode:
authorJoakim Verona <joakim@verona.se>2016-01-15 20:06:45 +0100
committerJoakim Verona <joakim@verona.se>2016-01-15 20:06:45 +0100
commit4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch)
tree18452b36b890faf52d40f555ebe4dc3c6e020bc6 /nextstep
parent0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff)
parent984a14904658da42ca9dea50a811a901ddc56e60 (diff)
downloademacs-xwidget_mvp.tar.gz
merge masterxwidget_mvp
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog.12
-rw-r--r--nextstep/INSTALL2
-rw-r--r--nextstep/Makefile.in2
-rw-r--r--nextstep/templates/Info.plist.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1
index f7cd2b0b840..007dfa4b7a1 100644
--- a/nextstep/ChangeLog.1
+++ b/nextstep/ChangeLog.1
@@ -312,7 +312,7 @@
;; coding: utf-8
;; End:
- Copyright (C) 2008-2015 Free Software Foundation, Inc.
+ Copyright (C) 2008-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nextstep/INSTALL b/nextstep/INSTALL
index 8c9cd3bab2b..dd690abf1b1 100644
--- a/nextstep/INSTALL
+++ b/nextstep/INSTALL
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2015 Free Software Foundation, Inc.
+Copyright (C) 2008-2016 Free Software Foundation, Inc.
See the end of the file for license conditions.
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 04d87d889d4..9aa034ad98d 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -1,6 +1,6 @@
### @configure_input@
-## Copyright (C) 2012-2015 Free Software Foundation, Inc.
+## Copyright (C) 2012-2016 Free Software Foundation, Inc.
## This file is part of GNU Emacs.
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index a0357b29fa5..dcd2fe34167 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (C) 2008-2015 Free Software Foundation, Inc.
+Copyright (C) 2008-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.