Merge branch 'vim' into feat/rel-line-numbers
commit0e62ef2e9a1fc1128c33392d31f6fcd7d2e707cc
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 22 Jul 2009 21:09:19 +0000 (22 23:09 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 22 Jul 2009 21:09:19 +0000 (22 23:09 +0200)
treec11cc411245f09bd8fc364bea08ac84a6d21c62b
parentaa5a129d9c8c6252d838adad8dd3d5f48d424e7c
parent4c68bd35215c8f06a1b9dc612d9dcd60d3d34b65
Merge branch 'vim' into feat/rel-line-numbers
src/misc1.c
src/option.c