]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into hints-overlap-fix
authorSimon Lydell <simon.lydell@gmail.com>
Wed, 4 Sep 2013 22:09:51 +0000 (00:09 +0200)
committerSimon Lydell <simon.lydell@gmail.com>
Wed, 4 Sep 2013 22:09:51 +0000 (00:09 +0200)
commit060deea1496085f116a06e10c3f3756fba4d6c43
tree4106d57ca67553ef80cda3e113306bec73c15690
parentbb2a66c61d22b9aeeaba5389d011fa9c70d29b5d
parent149cea6bccdeb74e75f2bef4ea0ec67c5146adc6
Merge branch 'develop' into hints-overlap-fix

Conflicts:
extension/locale/ru/vimfx.properties
extension/locale/el-GR/vimfx.properties
extension/locale/ru/vimfx.properties
extension/locale/zh-CN/vimfx.properties
Imprint / Impressum