Merge branch 'vim'
commit850694686f0cd8971c2a6f12f371417c0b1cfece
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 24 Aug 2008 15:10:42 +0000 (24 17:10 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 24 Aug 2008 15:10:42 +0000 (24 17:10 +0200)
treeaba5bb0396958ef74808e7d7979570b5b8d3f539
parentf40fb8e28052a183f5442a1597d1c7e9d65dc4b7
parent4e9132e4de9788938d9ec6a57882916621cf5d20
Merge branch 'vim'

Conflicts:

src/pty.c
src/menu.c
src/version.c