Merge branch 'vim'
commit6a40713efc67f9c0052f7378b0c100fb5400f4fc
authorBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 2 Aug 2009 12:19:48 +0000 (2 14:19 +0200)
committerBjorn Winckler <bjorn.winckler@gmail.com>
Sun, 2 Aug 2009 12:19:48 +0000 (2 14:19 +0200)
tree9ff33588c24904f6b11f0fb31fd4ff3b0a59be6d
parent4f3ae09bb4bcf9b91ad99ea2ca6140ab72191ca5
parent20b663d67d02847c72abf3f12b97da45877148d0
Merge branch 'vim'
src/fileio.c
src/globals.h
src/gui.c
src/option.c
src/structs.h
src/version.c