Merge branch 'vim' into feat/indent-wrap-lines
commit71fa0f24cd04622d544a2906ad82a08c538d6f2d
authorMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Feb 2010 21:45:34 +0000 (24 22:45 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Wed, 24 Feb 2010 21:45:34 +0000 (24 22:45 +0100)
tree9929ed4f06a4892eb8bb75234eb9a750b70331b8
parent6379c83a97ac37864f6d877ac5e73a191f2af377
parent7d0f52f71f83d59e6bdb68747746c4b392b170a6
Merge branch 'vim' into feat/indent-wrap-lines
src/option.c
src/option.h