Merge branch 'feat/tagfunc'
authorMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:15:59 +0000 (13 19:15 +0200)
committerMarkus Heidelberg <markus.heidelberg@web.de>
Sun, 13 Jun 2010 17:15:59 +0000 (13 19:15 +0200)
12 files changed:
1  2 
runtime/doc/options.txt
src/buffer.c
src/edit.c
src/eval.c
src/ex_cmds.c
src/globals.h
src/normal.c
src/option.c
src/option.h
src/structs.h
src/version.c
src/vim.h

Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/edit.c
Simple merge
diff --cc src/eval.c
Simple merge
diff --cc src/ex_cmds.c
Simple merge
diff --cc src/globals.h
Simple merge
diff --cc src/normal.c
Simple merge
diff --cc src/option.c
Simple merge
diff --cc src/option.h
Simple merge
diff --cc src/structs.h
Simple merge
diff --cc src/version.c
Simple merge
diff --cc src/vim.h
Simple merge