# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454436904 -3600
# Node ID 8e84273089d03c18c5d19888d1c2d9cfa60632a5
# Parent  8ab9a34a0ec54b41258d59198b35ad70d1061b2c
commit https://github.com/vim/vim/commit/04b08c3de68534adff95c8823787299e07ed3b49
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Feb 2 19:01:55 2016 +0100

    patch 7.4.1241
    Problem:    Missing change in Makefile due to diff mismatch
    Solution:   Update the list of object files.

diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -1591,7 +1591,7 @@ OBJ_COMMON = \
 	objects/if_cscope.o \
 	objects/if_xcmdsrv.o \
 	objects/mark.o \
-        objects/memline.o \
+	objects/memline.o \
 	objects/menu.o \
 	objects/message.o \
 	objects/misc1.o \
@@ -1633,11 +1633,17 @@ OBJ_COMMON = \
 	$(WSDEBUG_OBJ)
 
 OBJ = $(OBJ_COMMON) \
+	objects/json.o \
 	objects/main.o \
 	objects/memfile.o
 
+JSON_TEST_OBJ = $(OBJ_COMMON) \
+	objects/json_test.o \
+	objects/memfile.o
+
 MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
-        objects/memfile_test.o
+	objects/json.o \
+	objects/memfile_test.o
 
 PRO_AUTO = \
 	blowfish.pro \
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1241,
+/**/
     1240,
 /**/
     1239,