Mark Griffiths fed4bb5c07 Merge branch 'master' into documentation-update ...

Conflicts (FIXED):
	.gitignore
	doc_src/complete.txt
	doc_src/function.txt

2014-08-19 11:42:21 +01:00

..

alias.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

and.txt

Simplify styling

2014-08-01 13:25:41 +01:00

ascii_fish.png

Documentation update

2014-08-01 03:37:32 +01:00

begin.txt

Simplify styling

2014-08-01 13:25:41 +01:00

bg.txt

Simplify styling

2014-08-01 13:25:41 +01:00

bind.txt

Simplify styling

2014-08-01 13:25:41 +01:00

block.txt

Simplify styling

2014-08-01 13:25:41 +01:00

break.txt

Simplify styling

2014-08-01 13:25:41 +01:00

breakpoint.txt

Simplify styling

2014-08-01 13:25:41 +01:00

builtin.txt

Simplify styling

2014-08-01 13:25:41 +01:00

case.txt

Simplify styling

2014-08-01 13:25:41 +01:00

cd.txt

Simplify styling

2014-08-01 13:25:41 +01:00

command.txt

Simplify styling

2014-08-01 13:25:41 +01:00

commandline.txt

Simplify styling

2014-08-01 13:25:41 +01:00

commands.hdr.in

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

complete.txt

Merge branch 'master' into documentation-update

2014-08-19 11:42:21 +01:00

contains.txt

Simplify styling

2014-08-01 13:25:41 +01:00

continue.txt

Simplify styling

2014-08-01 13:25:41 +01:00

count.txt

Simplify styling

2014-08-01 13:25:41 +01:00

design.hdr

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

dirh.txt

Simplify styling

2014-08-01 13:25:41 +01:00

dirs.txt

Simplify styling

2014-08-01 13:25:41 +01:00

echo.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

else.txt

Simplify styling

2014-08-01 13:25:41 +01:00

emit.txt

Simplify styling

2014-08-01 13:25:41 +01:00

end.txt

Simplify styling

2014-08-01 13:25:41 +01:00

eval.txt

Simplify styling

2014-08-01 13:25:41 +01:00

exec.txt

Simplify styling

2014-08-01 13:25:41 +01:00

exit.txt

Simplify styling

2014-08-01 13:25:41 +01:00

faq.hdr

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

fg.txt

Simplify styling

2014-08-01 13:25:41 +01:00

fish_config.txt

Documentation update

2014-08-01 03:37:32 +01:00

fish_indent.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

fish_prompt.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

fish_right_prompt.txt

Simplify styling

2014-08-01 13:25:41 +01:00

fish_update_completions.txt

Documentation update

2014-08-01 03:37:32 +01:00

fish.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

for.txt

Simplify styling

2014-08-01 13:25:41 +01:00

funced.txt

Simplify styling

2014-08-01 13:25:41 +01:00

funcsave.txt

Simplify styling

2014-08-01 13:25:41 +01:00

function.txt

Merge branch 'master' into documentation-update

2014-08-19 11:42:21 +01:00

functions.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

help.txt

Simplify styling

2014-08-01 13:25:41 +01:00

history.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

if.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

index.hdr.in

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

isatty.txt

Simplify styling

2014-08-01 13:25:41 +01:00

jobs.txt

Simplify styling

2014-08-01 13:25:41 +01:00

license.hdr

Merge branch 'master' into documentation-update

2014-08-05 13:50:21 +01:00

math.txt

Simplify styling

2014-08-01 13:25:41 +01:00

mimedb.txt

Simplify styling

2014-08-01 13:25:41 +01:00

nextd.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

not.txt

Simplify styling

2014-08-01 13:25:41 +01:00

open.txt

Simplify styling

2014-08-01 13:25:41 +01:00

or.txt

Simplify styling

2014-08-01 13:25:41 +01:00

popd.txt

Simplify styling

2014-08-01 13:25:41 +01:00

prevd.txt

Simplify styling

2014-08-01 13:25:41 +01:00

psub.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

pushd.txt

Simplify styling

2014-08-01 13:25:41 +01:00

pwd.txt

Simplify styling

2014-08-01 13:25:41 +01:00

random.txt

Simplify styling

2014-08-01 13:25:41 +01:00

read.txt

Simplify styling

2014-08-01 13:25:41 +01:00

return.txt

Simplify styling

2014-08-01 13:25:41 +01:00

set_color.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

set.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

source.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

status.txt

Simplify styling

2014-08-01 13:25:41 +01:00

switch.txt

Simplify styling

2014-08-01 13:25:41 +01:00

test.txt

Simplify styling

2014-08-01 13:25:41 +01:00

trap.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

tutorial.hdr

Fixed a few more edge cases

2014-08-19 10:58:22 +01:00

type.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

ulimit.txt

Simplify styling

2014-08-01 13:25:41 +01:00

umask.txt

Simplify styling

2014-08-01 13:25:41 +01:00

user_doc.css

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00

user_doc.footer.html

Documentation update

2014-08-01 03:37:32 +01:00

user_doc.header.html

Documentation update

2014-08-01 03:37:32 +01:00

vared.txt

Simplify styling

2014-08-01 13:25:41 +01:00

while.txt

Tutorial auto colouring, Man page and Make fixes

2014-08-08 03:44:37 +01:00