Merge from trunk and resolve conflicts.

[bpt/emacs.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 5fd329c..b829e93 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,6 @@
 # Build Emacs from a fresh tarball or version-control checkout.
 
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #