adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 7.4.1241

Browse Source 
Problem:    Missing change in Makefile due to diff mismatch
Solution:   Update the list of object files.
This commit is contained in:
Bram Moolenaar
2016-02-02 19:01:55 +01:00
parent bc07309225
commit 04b08c3de6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

@ -1591,7 +1591,7 @@ OBJ_COMMON = \
objects/if_cscope.o \ objects/if_cscope.o \
objects/if_xcmdsrv.o \ objects/if_xcmdsrv.o \
objects/mark.o \ objects/mark.o \
objects/memline.o \ objects/memline.o \
objects/menu.o \ objects/menu.o \
objects/message.o \ objects/message.o \
objects/misc1.o \ objects/misc1.o \
@ -1633,11 +1633,17 @@ OBJ_COMMON = \
$(WSDEBUG_OBJ) $(WSDEBUG_OBJ)
OBJ = $(OBJ_COMMON) \ OBJ = $(OBJ_COMMON) \
objects/json.o \
objects/main.o \ objects/main.o \
objects/memfile.o objects/memfile.o
JSON_TEST_OBJ = $(OBJ_COMMON) \
objects/json_test.o \
objects/memfile.o
MEMFILE_TEST_OBJ = $(OBJ_COMMON) \ MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
objects/memfile_test.o objects/json.o \
objects/memfile_test.o
PRO_AUTO = \ PRO_AUTO = \
blowfish.pro \ blowfish.pro \

2
src/version.c
View File

@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1241,
/**/ /**/
1240, 1240,
/**/ /**/