Merge branch 'vim' into feat/rel-line-numbers
commit0cb97cfb862b2a089d653beac3156458674a0cd9
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 11 Nov 2009 23:32:51 +0000 (12 00:32 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 11 Nov 2009 23:32:51 +0000 (12 00:32 +0100)
treeb9d816dc094517a6c3524726dff0385d22f804a3
parentc5f587cf37b63afbb77af49850c984d98bf7cb4b
parent403458f5a2d8f682b45d28c0533c595c5d5c90f1
Merge branch 'vim' into feat/rel-line-numbers
src/edit.c
src/misc1.c
src/misc2.c
src/screen.c