Merge remote-tracking branch 'vim/master'

This commit is contained in:
Kazuki Sakamoto
2016-05-11 21:26:19 -07:00
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -2703,8 +2703,8 @@ quality_pairs[] = {
#ifdef ANTIALIASED_QUALITY
{"ANTIALIASED", ANTIALIASED_QUALITY},
#endif
#ifdef NOANTIALIASED_QUALITY
{"NOANTIALIASED", NOANTIALIASED_QUALITY},
#ifdef NONANTIALIASED_QUALITY
{"NONANTIALIASED", NONANTIALIASED_QUALITY},
#endif
#ifdef PROOF_QUALITY
{"PROOF", PROOF_QUALITY},
+2
View File
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1830,
/**/
1829,
/**/