]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into proper-modes
authorSimon Lydell <simon.lydell@gmail.com>
Tue, 1 Oct 2013 09:39:57 +0000 (11:39 +0200)
committerSimon Lydell <simon.lydell@gmail.com>
Tue, 1 Oct 2013 09:39:57 +0000 (11:39 +0200)
commit728fd831dc9257c50f7ff4bf72e9e5f49e9e344e
tree643ab1bf43d424114ff54d8735f422bcab4dbb82
parentf9dd09a12455b177cc6507a7c4a8bcfdf999d5d6
parentc30d2c20ee6a98c39a5ccb4b0a8e436a6b02da14
Merge branch 'develop' into proper-modes

Conflicts:
extension/packages/button.coffee
extension/packages/events.coffee
extension/packages/utils.coffee
14 files changed:
extension/locale/de/vimfx.properties
extension/locale/el-GR/vimfx.properties
extension/locale/en-US/vimfx.properties
extension/locale/hu/vimfx.properties
extension/locale/id/vimfx.properties
extension/locale/nl/vimfx.properties
extension/locale/pl/vimfx.properties
extension/locale/ru/vimfx.properties
extension/locale/zh-CN/vimfx.properties
extension/packages/button.coffee
extension/packages/events.coffee
extension/packages/mode-hints/hints.coffee
extension/packages/modes.coffee
extension/packages/utils.coffee
Imprint / Impressum