]> git.notmuchmail.org Git - sup/commit
Merge branch 'undo-manager' into next
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 14:22:15 +0000 (07:22 -0700)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Mon, 18 May 2009 14:26:29 +0000 (07:26 -0700)
commit392847a8e0abba1887ca76e24666eca7492507bd
tree6fc3968d211c45c474c5abb4ac5e849f038fafa7
parent47133afaad9c0a0eb34cf1b4fb77a251388a4359
parent7999ea4fd7a1f2b005c9ac0d9a56ade1c43c159a
Merge branch 'undo-manager' into next

Conflicts:

lib/sup/modes/thread-index-mode.rb
lib/sup/modes/thread-index-mode.rb