diff .hgsubstate @ 257:3ecf32c893ab

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 07 Jan 2015 20:54:59 -0800
parents 6afb75039a25 122919f93598
children 230cd2fc2e29
line wrap: on
line diff
--- a/.hgsubstate	Tue Jan 06 23:23:46 2015 -0800
+++ b/.hgsubstate	Wed Jan 07 20:54:59 2015 -0800
@@ -9,12 +9,12 @@
 81c6dd7ce3169e5ad9ba92422ba6e1ce5b074e36 vim/bundle/colorschemes
 9c685131a5facfa0d643feca3a61b41c007d8170 vim/bundle/commentary
 5d2aa8522dfd73a699b77128a310535d9d462061 vim/bundle/ctrlp
-55de0be306844ba8ad63c6e910e9c8f8234a209e vim/bundle/easymotion
+9ceebf91fc137644cf0693561a386ef4071dbf87 vim/bundle/easymotion
 2c8461db084d205903a792a23163faa546f143c9 vim/bundle/fugitive
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 c9dfccf3c2f762f5f1f2b86320f2fd0258998ed0 vim/bundle/gutentags
 204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml
-4dfa6c4e679ae326cc7486012f0433a92c64426e vim/bundle/interestingwords
+6e0ac033107bd12c1390cbdf49398393930f3fb6 vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
 53a2c9403ba8e8d7f5229eead2e6933ab04c70d1 vim/bundle/lawrencium
 940a8defa0576385dee1ad177bab0b34738540aa vim/bundle/less
@@ -24,13 +24,13 @@
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
 c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/pythonmode
-12e379989e3258af0934e10173386235c7d69944 vim/bundle/ragtag
-2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
+07115a6dee0ae01b7c9c3d92e9ee3219b6780b77 vim/bundle/ragtag
+5eba0f19c87402643eb8a7e7d20d9d5338fd6d71 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 b0ca47f4570385043f270f9278ba6d50d1d2fa00 vim/bundle/supertab
 fa433e0b7330753688f715f3be5d10dc480f20e5 vim/bundle/surround
-30b4ce3411f539f695ab8def7fc69c2f835eb8fe vim/bundle/syntastic
-f9c5f24576e82aae5ab8a5480f1ae48615354e40 vim/bundle/tagbar
+0da7a1e476ef03be22718e813fbc729f9dc163b4 vim/bundle/syntastic
+bfc121dc38271ab3f050609bb2ca377de07d8bd6 vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring