changeset 8092:d82fb42b611b v7.4.1340

commit https://github.com/vim/vim/commit/7d63f624603ebeae336d4c504f82ab3da3481f46 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Feb 16 20:31:31 2016 +0100 patch 7.4.1340 Problem: Merge left extra #endif behind. Solution: Remove the #endif
author Christian Brabandt <cb@256bit.org>
date Tue, 16 Feb 2016 20:45:05 +0100
parents 4d0827501e35
children 4ffd0f8167f8
files src/os_win32.c src/version.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -354,7 +354,6 @@ wait_for_single_object(
 }
 # endif
 #endif
-#endif
 
     static void
 get_exe_name(void)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1340,
+/**/
     1339,
 /**/
     1338,