Merge branch 'CPlusPlus' of gitorious.org:~ridiculousfish/fish-shell/fishfish into CPlusPlus

This commit is contained in:
Siteshwar Vashisht
2012-01-16 22:27:55 +05:30
27 changed files with 130 additions and 104 deletions

View File

@@ -1125,7 +1125,7 @@ static int printed_width( const wchar_t *str, int len )
}
wchar_t *parser_current_line()
const wchar_t *parser_current_line()
{
int lineno=1;