From: Glenn Morris Date: Wed, 12 Sep 2007 07:30:07 +0000 (+0000) Subject: Standardize license text. X-Git-Tag: emacs-pretest-23.0.90~10949 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58efff64115587db48cdf9d05948e087bf21b36c;p=emacs.git Standardize license text. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df168fae3af..ea5ab388ca1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-12 Glenn Morris + + * textmodes/org-publish.el (org-publish-org-to-html): Remove + duplicate function definition. + 2007-09-10 Chris Moore * diff-mode.el (diff-sanity-check-hunk): diff --git a/lisp/textmodes/org-publish.el b/lisp/textmodes/org-publish.el index 46dcf775059..79ccdda05b9 100644 --- a/lisp/textmodes/org-publish.el +++ b/lisp/textmodes/org-publish.el @@ -6,19 +6,19 @@ ;; Keywords: hypermedia, outlines ;; Version: 1.80 -;; This file is free software; you can redistribute it and/or modify +;; 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, or (at your option) ;; any later version. -;; This file 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 GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;; This file is part of GNU Emacs.