diff .hgsubstate @ 330:bb175816e4c9

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 31 Oct 2015 20:41:20 -0700
parents 112900c3f7e4 5744670c5c0e
children 1cfcad59709f
line wrap: on
line diff
--- a/.hgsubstate	Sat Oct 31 17:36:39 2015 -0700
+++ b/.hgsubstate	Sat Oct 31 20:41:20 2015 -0700
@@ -10,6 +10,7 @@
 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status
 3b23c55eb43849975656dd89e3f35dacd2b93e69 mutt/mutt-colors-solarized
 14897c793e0978e88967afbcd2d8e85041febceb pentadactyl/plugins/pintaboard
+f755abfb1c4e4e3f59f6cfa25ce16edb5af9e516 vim/bundle/ag
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 28a989b28457e38df620e4c7ab23e224aff70efe vim/bundle/colorschemes
 e0f4850d78137a35b9461c530078bd77f39e4dce vim/bundle/commentary