Merge branch 'master' into cairo

[gnu-emacs] / admin / merge-pkg-config

diff --git a/admin/merge-pkg-config b/admin/merge-pkg-config
index fd03a441b11cae9db792ae435f5d2d0eedbae773..2ee633d36c1bd54aa1dd6839ebb69c643b4f8b33 100755 (executable)
--- a/admin/merge-pkg-config
+++ b/admin/merge-pkg-config
@@ -4,7 +4,7 @@
 #
 #      admin/merge-pkg-config
 
-# Copyright 2014 Free Software Foundation, Inc.
+# Copyright 2014-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.