patch 7.4.1176

Problem:    Missing change to proto file.
Solution:   Update the proto file. (Charles Cooper)

diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 6752d916fe5edb0ce117c7f986cc77c78e86dc98..57c6238f87aca5efb386a625082ef7c52bafeec8 100644 (file)
--- 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 9568029c449e610bdac5cb8da5df73f05300a981..56d6d812d763de3cf8eb5ec538fb92cd7727d77f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1176,
 /**/
     1175,
 /**/