Merge branch 'vim' into fix/fast-join
commita352cb157679fa8286dfd1e3e23b860a61fae9c0
authorMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 25 Dec 2009 16:08:48 +0000 (25 17:08 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 25 Dec 2009 16:08:48 +0000 (25 17:08 +0100)
treedd39acbc6a7755b08d2d58addf7ed590e4561fee
parent573ea6e657f8be884676ac4e8da3dcfe206460ed
parentde3b9954f826fca07478edcc627ba460db7b22f1
Merge branch 'vim' into fix/fast-join
src/edit.c
src/normal.c