From 34ef52dd56d0653c032732a0143d77ebd869073b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 17 Nov 2009 11:31:25 +0000
Subject: updated for version 7.2-296

---
 src/main.c    | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    296,
 /**/
     295,
 /**/
-- 
cgit v1.2.1