Merge branch 'vim' into feat/emb-common-lisp
commit72b7ee72d3edcd84d405804992f9f18449a13ee3
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sat, 23 May 2009 13:27:37 +0000 (23 15:27 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Sat, 23 May 2009 13:27:37 +0000 (23 15:27 +0200)
treec5d87b747f5ee80e6916092691990e07b616788d
parent4e224fcf1ed6af98faec1a2b8b580bf4f7604b1a
parent5f980f5fe514ec5b4540d0230e21df2c0ce50940
Merge branch 'vim' into feat/emb-common-lisp

Conflicts:
src/auto/configure

Caused by:
[7.2.183] Configure problem for sys/sysctl.h on OpenBSD. (Dasn)
src/Makefile
src/auto/configure
src/config.h.in
src/configure.in
src/version.c