Merge branch 'vim' into feat/rel-line-numbers
commit8fb62c2efce37f1feaf71741b3f12faf08a8ae84
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Feb 2010 21:56:53 +0000 (24 22:56 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Feb 2010 21:56:53 +0000 (24 22:56 +0100)
tree8cc615aca54b1617876a4013f773d864a10d7239
parent428e1f3d7058363ed0cef7522091102bad7e46ee
parent7d0f52f71f83d59e6bdb68747746c4b392b170a6
Merge branch 'vim' into feat/rel-line-numbers
src/option.c
src/option.h