[Emacs-diffs] master 5874cd4 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Phillip Lord]

branch: master
commit 5874cd46e9cd8b20c61190ad56055d73816c2303
Merge: 3ab2622 098738f
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 test/make-test-deps.emacs-lisp |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/make-test-deps.emacs-lisp b/test/make-test-deps.emacs-lisp
index 7831da3..3af0685 100644
--- a/test/make-test-deps.emacs-lisp
+++ b/test/make-test-deps.emacs-lisp
@@ -1,21 +1,21 @@
 ;; -*- emacs-lisp -*-
 
-;; The contents of this file are subject to the GPL License, Version 3.0.
-;;
-;; Copyright (C) 2015, Free Software Foundation
-;;
-;; This program is free software: you can redistribute it and/or modify
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary: