Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Integration_2.2.0'

Browse source
This commit is contained in:
David Adam 2015-05-21 15:30:26 +08:00
commit 781b61d074
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc_src/faq.hdr
View file

@ -162,7 +162,7 @@ Quick answer:
Run the following command in fish: Run the following command in fish:
\fish{cli-dark} \fish{cli-dark}
echo 'function fish_title;end' >> ~/.config/fish/config.fish function fish_title; end; funcsave fish_title
\endfish \endfish
Problem solved! Problem solved!

6
fish.xcodeproj/project.pbxproj
View file

@ -1327,7 +1327,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.2\\\"", "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -1455,7 +1455,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.2\\\"", "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -1483,7 +1483,7 @@
"SYSCONFDIR=L\\\"/usr/local/etc\\\"", "SYSCONFDIR=L\\\"/usr/local/etc\\\"",
"BINDIR=L\\\"/usr/local/bin\\\"", "BINDIR=L\\\"/usr/local/bin\\\"",
"DOCDIR=L\\\"/usr/local/share/doc\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"",
"FISH_BUILD_VERSION=\\\"2.1.2\\\"", "FISH_BUILD_VERSION=\\\"2.2b1-git\\\"",
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;

4
osx/config.h
View file

@ -222,7 +222,7 @@
#define PACKAGE_NAME "fish" #define PACKAGE_NAME "fish"
/* Define to the full name and version of this package. */ /* 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 to the one symbol short name of this package. */
#define PACKAGE_TARNAME "fish" #define PACKAGE_TARNAME "fish"
@ -231,7 +231,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* 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 to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1