Merge from trunk and resolve conflicts.

[bpt/emacs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 9cfaa40..e7c28c1 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ### autogen.sh - tool to help build Emacs from a bzr checkout
 
-## Copyright (C) 2011-2012  Free Software Foundation, Inc.
+## Copyright (C) 2011-2013 Free Software Foundation, Inc.
 
 ## Author: Glenn Morris <rgm@gnu.org>