diff --git a/src/Makefile b/src/Makefile index 31664b6716..93a889831b 100644 --- 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 index 712377a23d..39090d4fed 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1241, /**/ 1240, /**/