summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-25 16:05:56 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-25 16:05:56 +0100
commit1d63539cc72c5be7ad875d2d48a34c4f74c096ab (patch)
tree3e49608e3b3d95f157af59c6f8a66a6dd934727d
parentf75612fd9912205870bf024e4fb20af62b096c1d (diff)
patch 7.4.1176v7.4.1176
Problem: Missing change to proto file. Solution: Update the proto file. (Charles Cooper)
-rw-r--r--src/proto/gui_w32.pro2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 6752d916fe..57c6238f87 100644
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -96,5 +96,5 @@ void gui_mch_post_balloon(BalloonEval *beval, char_u *mesg);
BalloonEval *gui_mch_create_beval_area(void *target, char_u *mesg, void (*mesgCB)(BalloonEval *, int), void *clientData);
void gui_mch_destroy_beval_area(BalloonEval *beval);
void netbeans_draw_multisign_indicator(int row);
-void netbeans_init_winsock(void);
+void channel_init_winsock(void);
/* vim: set ft=c : */
diff --git a/src/version.c b/src/version.c
index 9568029c44..56d6d812d7 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 */
/**/
+ 1176,
+/**/
1175,
/**/
1174,