summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-11-17 11:31:25 +0000
committerBram Moolenaar <Bram@vim.org>2009-11-17 11:31:25 +0000
commit34ef52dd56d0653c032732a0143d77ebd869073b (patch)
tree62d799d907d8b3e67c09ad4533ff54efce397326 /src
parent627b1d38624535c79912c48a5382aebbd5fb1e1e (diff)
downloadvim-34ef52dd56d0653c032732a0143d77ebd869073b.zip
updated for version 7.2-296
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 13707ce11..954384a56 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3151,7 +3151,7 @@ usage()
main_msg(_("--servername <name>\tSend to/become the Vim server <name>"));
#endif
#ifdef STARTUPTIME
- main_msg(_("--startuptime=<file>\tWrite startup timing messages to <file>"));
+ main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>"));
#endif
#ifdef FEAT_VIMINFO
main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo"));
diff --git a/src/version.c b/src/version.c
index 19ac2a8f8..08ba161aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 296,
+/**/
295,
/**/
294,