# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455651905 -3600
# Node ID d82fb42b611b2d8e34bfec092371496dca5e5d4f
# Parent  4d0827501e35cb4917f35a85a40ddc6b7e692084
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

diff --git a/src/os_win32.c b/src/os_win32.c
--- 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)
diff --git a/src/version.c b/src/version.c
--- 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,