898c186130c5
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Wed, 26 Feb 2014 12:13:24 -0500 |
| parents | 4811a2814b49 (current diff) 0a515c6eb4c4 (diff) |
| children | e0224a489d52 efcd701f7122 |
| branches/tags | (none) |
| files | vim/vimrc |
Changes
--- a/ffignore Tue Feb 25 18:08:40 2014 -0500 +++ b/ffignore Wed Feb 26 12:13:24 2014 -0500 @@ -7,3 +7,4 @@ syntax:regex ^./target$ +^./\w+-(client|wire|service)/target$
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fish/functions/ms-to-utc.fish Wed Feb 26 12:13:24 2014 -0500 @@ -0,0 +1,3 @@ +function ms-to-utc -d "convert epoch milliseconds to UTC" + date -ur (echo -n $argv[1] | sed -e 's/...$//') +end
--- a/gitignore Tue Feb 25 18:08:40 2014 -0500 +++ b/gitignore Wed Feb 26 12:13:24 2014 -0500 @@ -3,3 +3,4 @@ tags1 tags2 tags.bak +*-SCRATCH.*
--- a/vim/vimrc Tue Feb 25 18:08:40 2014 -0500 +++ b/vim/vimrc Wed Feb 26 12:13:24 2014 -0500 @@ -1120,7 +1120,6 @@ " Send to tmux with localleader e au FileType pgsql nnoremap <buffer> <silent> <localleader>e :let psql_tslime_view = winsaveview()<cr>vip"ry:call SendToTmux(@r)<cr>:call winrestview(psql_tslime_view)<cr> - augroup END " }}}