Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[bpt/emacs.git] / msdos / is_exec.c

diff --git a/msdos/is_exec.c b/msdos/is_exec.c
index c8bb7dc..16b01c5 100644 (file)
--- a/msdos/is_exec.c
+++ b/msdos/is_exec.c
@@ -6,10 +6,10 @@
  * (See the README file in this directory for the copyright and license
  * history of this file.)
  *
- * This file is free software; you can redistribute it and/or modify
+ * This file 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 2, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this file; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * along with this file.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Commentary:
  *
@@ -238,5 +236,3 @@ _is_executable(const char *filename, int fhandle, const char *extension)
   return 0;
 }
 
-/* arch-tag: b0965811-8c3e-4bc4-8d81-4447a3594785
-   (do not change this comment) */