]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Fri, 15 Jan 2016 08:12:45 +0000 (09:12 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Fri, 15 Jan 2016 08:12:45 +0000 (09:12 +0100)
commit4af745c901e5f8f5978dd05535daa3d0717830c6
treed5bf7608a53b3d1927c858113889619ce7ce6f9c
parenta218f009a94f08252ba1d3a2dce90aef12cb827a
parent098e1929010d72e9e39c3554805707cc77c1e317
Merge branch 'master' into develop

Conflicts:
extension/lib/marker.coffee
extension/lib/commands-frame.coffee
extension/lib/commands.coffee
extension/lib/hints.coffee
extension/lib/marker.coffee
extension/lib/modes.coffee
extension/locale/de/vimfx.properties
Imprint / Impressum