Merge branch 'vim' into feat/lua
commit94d1b55f3630a6a904a5fd04b60f0e78aae81302
authorMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 28 Jan 2010 12:04:09 +0000 (28 13:04 +0100)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Thu, 28 Jan 2010 12:04:09 +0000 (28 13:04 +0100)
tree33fd223c5d45e00cfacc1c272c6a13fdd5cdde32
parent0bad1e5b3a7311c441b6ffe0917bdd617402acd8
parente5251c36f2549f1add6262cab939b29a54f144b2
Merge branch 'vim' into feat/lua
src/version.c
src/window.c