20140729: Merge branch 'master' of git://github.com/b4winckler/macvim

splhack released this 05 Aug 03:57

· 12231 commits to master since this release

4651cf5

Conflicts:
	runtime/syntax/vim.vim
	src/MacVim/Info.plist
	src/option.c
	src/structs.h

Assets 2