Merge branch 'vim' into feat/rel-line-numbers
commit8fb9dfd21f9c92706677e980783d802458ca919b
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 28 Jan 2010 12:04:12 +0000 (28 13:04 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 28 Jan 2010 12:04:12 +0000 (28 13:04 +0100)
tree1fa9efc165e8ce42841542e0b328f70529acbf08
parent1decf02e3a96d97d2aad44b8d9c053d19ed4027f
parente5251c36f2549f1add6262cab939b29a54f144b2
Merge branch 'vim' into feat/rel-line-numbers
src/gui.c
src/option.c