]> git.cworth.org Git - sup/commit
Merge commit 'origin/undo-manager'
authorWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 28 May 2009 14:45:06 +0000 (10:45 -0400)
committerWilliam Morgan <wmorgan-sup@masanjin.net>
Thu, 28 May 2009 14:47:35 +0000 (10:47 -0400)
commit9478114b592e0ba7917a65804aacd401d21d70c2
tree1ddc1a72dce77988739be163e551c2db968a81f3
parent7ab166131aa760740dac97333f04a79966cb5fc2
parent7999ea4fd7a1f2b005c9ac0d9a56ade1c43c159a
Merge commit 'origin/undo-manager'

Conflicts:

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