From 0ce79e3fea2813f8217d2644bd01b3781b2bf5b3 Mon Sep 17 00:00:00 2001
From: vimboss <devnull@localhost>
Date: Wed, 2 Dec 2009 16:47:11 +0000
Subject: updated for version 7.2-314

---
 src/misc1.c   | 2 --
 src/version.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc1.c b/src/misc1.c
index 7da8701c..3da0d9ae 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4666,7 +4666,6 @@ concat_fnames(fname1, fname2, sep)
     return dest;
 }
 
-#if defined(FEAT_EVAL) || defined(FEAT_GETTEXT) || defined(PROTO)
 /*
  * Concatenate two strings and return the result in allocated memory.
  * Returns NULL when out of memory.
@@ -4687,7 +4686,6 @@ concat_str(str1, str2)
     }
     return dest;
 }
-#endif
 
 /*
  * Add a path separator to a file name, unless it already ends in a path
diff --git a/src/version.c b/src/version.c
index 80aeaa3d..376a78a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    314,
 /**/
     313,
 /**/
-- 
cgit v1.2.1