diff options
author | Glenn Morris <rgm@gnu.org> | 2013-03-30 09:55:47 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2013-03-30 09:55:47 -0700 |
commit | 8d3655be5a5c41b1f0a9985bcdb614693fce67e5 (patch) | |
tree | c213796b69a9d40c6563c211c20ea815754ad560 /lisp/profiler.el | |
parent | 14a581695f7b9c70b8531a41a327a2e01f6125ba (diff) | |
parent | b011a6e8011c51e09f28d528a541509c17d4eed0 (diff) | |
download | emacs-8d3655be5a5c41b1f0a9985bcdb614693fce67e5.tar.gz |
Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/profiler.el')
-rw-r--r-- | lisp/profiler.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/profiler.el b/lisp/profiler.el index 07192a39bef..093a01a8602 100644 --- a/lisp/profiler.el +++ b/lisp/profiler.el @@ -5,18 +5,20 @@ ;; Author: Tomohiro Matsuyama <tomo@cx4a.org> ;; Keywords: lisp -;; This program is free software; you can redistribute it and/or modify +;; 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: |