Julian Aron Prenner 213e907044 Merge remote-tracking branch 'upstream/master' into bind_mode ... Conflicts: builtin.cpp reader.cpp share/functions/fish_default_key_bindings.fish		2014-01-15 15:27:06 +01:00
..
completions	Rename __fish_complete_usb function.	2014-01-14 08:28:15 +01:00
functions	Merge remote-tracking branch 'upstream/master' into bind_mode	2014-01-15 15:27:06 +01:00
tools	Partially fix #1224.	2014-01-10 21:33:50 +01:00
config.fish	Revert "Ensure that UTF-8 works if LANG contains it."	2013-12-17 20:47:14 +01:00