]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Fri, 19 Feb 2016 18:27:01 +0000 (19:27 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Fri, 19 Feb 2016 18:27:01 +0000 (19:27 +0100)
commit984b16ca45e7befb9a7a12f989d25ead1882b7dc
tree1c9290bf44d339fbf4f025c283157cb19951b2b8
parent4adc17a111044ac19e0c3c3d1ef21e22cf6d2f62
parent4045b229a8a589d7d9ed87a2de03a26c94d0ee6d
Merge branch 'master' into develop

Conflicts:
extension/lib/api.coffee
extension/lib/commands.coffee
extension/lib/main-frame.coffee
extension/lib/main.coffee
extension/lib/message-manager.coffee
extension/test/index.coffee
extension/test/test-api.coffee
22 files changed:
documentation/CONTRIBUTING-CODE.md
documentation/tools.md
extension/bootstrap.coffee
extension/lib/api-frame.coffee
extension/lib/api.coffee
extension/lib/commands-frame.coffee
extension/lib/commands.coffee
extension/lib/config.coffee
extension/lib/defaults.coffee
extension/lib/events-frame.coffee
extension/lib/events.coffee
extension/lib/main-frame.coffee
extension/lib/main.coffee
extension/lib/message-manager.coffee
extension/lib/utils.coffee
extension/lib/vim-frame.coffee
extension/lib/vim.coffee
extension/lib/vimfx.coffee
extension/test/index.coffee
extension/test/test-api.coffee
extension/test/utils.coffee
gulpfile.coffee
Imprint / Impressum