29ed704bc669

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Tue, 14 Dec 2010 20:13:43 -0500
parents 1e291f276d21 (current diff) cae75a813ef9 (diff)
children c285337f1a8a
branches/tags (none)
files

Changes

--- a/.hgignore	Tue Dec 14 20:12:58 2010 -0500
+++ b/.hgignore	Tue Dec 14 20:13:43 2010 -0500
@@ -14,3 +14,4 @@
 
 mutt/temp
 mutt/cache
+vim/spell
--- a/.hgsubstate	Tue Dec 14 20:12:58 2010 -0500
+++ b/.hgsubstate	Tue Dec 14 20:13:43 2010 -0500
@@ -1,6 +1,6 @@
 0beba32679db6cf5db08ae57c5e99e411b54adc5 mercurial/templates
 b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
-206d80115d82fbb98d4c8fcb9bd4ab4c58179a9b vim/bundle/gundo
+810362206db582441cb91d788838014219dc8c3e vim/bundle/gundo
 1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
 34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
 930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter