Merge branch 'gawk-4.1-stable'

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b4b5f73..6816d7d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* dfa.c (using_simple_locale): Add ifdefs in case there is no
 	locale support at all. Thanks to Scott Deifik for the report.
 
+	Unrelated:
+
+	* main.c (UPDATE_YEAR): Set to 2014.
+
 2014-03-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* .gitignore: Add .dSYM directories for Mac OS X.
diff --git a/main.c b/main.c
index 5d8e3a9a..601881f3 100644
--- a/main.c
+++ b/main.c
@@ -24,7 +24,7 @@
  */
 
 /* FIX THIS BEFORE EVERY RELEASE: */
-#define UPDATE_YEAR	2013
+#define UPDATE_YEAR	2014
 
 #include "awk.h"
 #include "getopt.h"