merge upstream

This commit is contained in:
James Cox 2009-09-23 16:14:04 +01:00
commit fdffd77e9c
13 changed files with 150 additions and 29 deletions

View file

@ -1,3 +1,4 @@
## fixme, i duplicated this in xterms - oops
function title {
if [[ $TERM == "screen" ]]; then
# Use these two for GNU Screen: