# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1393434804 18000
# Node ID 898c186130c564d107c8c2c755c1964417b39458
# Parent  4811a2814b492ebe4c44761ace7130d845e2d2e3# Parent  0a515c6eb4c48c9af41add700c53d5e950c697e6
Merge.

diff -r 4811a2814b49 -r 898c186130c5 ffignore
--- 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$
diff -r 4811a2814b49 -r 898c186130c5 fish/functions/ms-to-utc.fish
--- /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
diff -r 4811a2814b49 -r 898c186130c5 gitignore
--- 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.*
diff -r 4811a2814b49 -r 898c186130c5 vim/vimrc
--- 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
 
 " }}}