Merge branch 'hinting-g-mode'
authorDaniel Carl <danielcarl@gmx.de>
Sun, 5 Jan 2014 18:56:22 +0000 (19:56 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Sun, 5 Jan 2014 18:56:22 +0000 (19:56 +0100)
commita40d7646956a37e90a9de03f50959e334a8d4b05
tree2c9bb9f30737306e6124650a076c3f007f063163
parentda54ee8edeb17dbf5ea64c28f7fa16d749cd49ef
parent9ad874b2dfa20b13bb7a0fd2871ce34602983ad0
Merge branch 'hinting-g-mode'

Conflicts:
src/hints.js
doc/vimb.1
src/hints.js
src/main.h