Merge branch 'Integration_2.2.0'

This commit is contained in:
David Adam
2015-05-21 15:30:26 +08:00
3 changed files with 6 additions and 6 deletions

View File

@@ -222,7 +222,7 @@
#define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "fish 2.1.2-git"
#define PACKAGE_STRING "fish 2.2b1-git"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish"
@@ -231,7 +231,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "2.1.2-git"
#define PACKAGE_VERSION "2.2b1-git"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1