updated for version 7.2-314
diff --git a/src/misc1.c b/src/misc1.c
index 7da8701..3da0d9a 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -4666,7 +4666,6 @@
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 @@
}
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 80aeaa3..376a78a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 314,
+/**/
313,
/**/
312,
