diff .hgsubstate @ 159:9c1c2ffcc7e2

Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 16 Dec 2013 16:40:42 -0800
parents 063afe08c251 7fd22eb11789
children 5997455e475b
line wrap: on
line diff
--- a/.hgsubstate	Thu Nov 28 11:56:40 2013 -0800
+++ b/.hgsubstate	Mon Dec 16 16:40:42 2013 -0800
@@ -20,5 +20,7 @@
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-fa2e6b96d928e610b06f2e2936b6f4dc7535a1d9 vim/bundle/syntastic
+94f710dddedef870736d7c55b387788b9a0afeda vim/bundle/syntastic
+6d8770f949b8bd5160e65a7fc8ebce588e3b4736 vim/bundle/tagbar
+869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom