summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_mac_conv.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index ad2d58dcb..1fddc61f3 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -14,7 +14,6 @@
*/
#define NO_X11_INCLUDES
-typedef int BalloonEval; /* used in header files */
#include "vim.h"
diff --git a/src/version.c b/src/version.c
index 163ae8e34..99007ac5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1316,
+/**/
1315,
/**/
1314,