summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-01-06 15:45:10 +0100
committerBram Moolenaar <Bram@vim.org>2014-01-06 15:45:10 +0100
commit5ec8305ea884f5b04566b3c72cdc8d60b6bd29ad (patch)
treeaedcd9eb362df7c8828ae70daa44adb33593436c
parent5f4c8406a2c58320a94de77f49b35eda7058f328 (diff)
downloadvim-5ec8305ea884f5b04566b3c72cdc8d60b6bd29ad.zip
updated for version 7.4.134
Problem: Spurious space in MingW Makefile. Solution: Remove the space. (Michael Soyka)
-rw-r--r--src/Make_ming.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 0b1935fde..f7088ad58 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -598,7 +598,7 @@ ifdef XPM
ifeq (yes, $(GUI))
OBJ += $(OUTDIR)/xpm_w32.o
# You'll need libXpm.a from http://gnuwin32.sf.net
-LIB += -L $(XPM)/lib -lXpm
+LIB += -L$(XPM)/lib -lXpm
endif
endif
diff --git a/src/version.c b/src/version.c
index 1ca8f9f30..efbfba157 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 134,
+/**/
133,
/**/
132,