Merge branch 'master' into merge-upstream
authorRui Abreu Ferreira <raf-ep@gmx.com>
Fri, 16 Dec 2011 09:57:53 +0000 (09:57 +0000)
committerRui Abreu Ferreira <raf-ep@gmx.com>
Fri, 16 Dec 2011 09:57:53 +0000 (09:57 +0000)
commitcc726fd4c6a1f0ba001107828c3381d839de45ae
tree38fe8f963302ad28e6c8404eae58aa02757f85e3
parentf1efc1ca19414bafd300bf83dc47b781cc57e37e
parent36584b68470244758ca7335b386d8f63db36382f
Merge branch 'master' into merge-upstream
src/Makefile
src/configure
src/configure.in
src/eval.c
src/ex_docmd.c
src/feature.h
src/gui.c
src/main.c
src/option.c
src/os_unix.c