]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into simpler-dom
authorSimon Lydell <simon.lydell@gmail.com>
Fri, 3 Jan 2014 17:03:13 +0000 (18:03 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Fri, 3 Jan 2014 17:03:13 +0000 (18:03 +0100)
commita6037c1df1492b2dbaee8799f45c5fa8e1d4c9bc
treebe78d44daff3935ca9e3540cde08fce9e29b4624
parent467dff7f7ba3abc8e52866cda482f65a25ae84bc
parent97218efa1c4ba7f7de0eebecefd6346eb3adf4cb
Merge branch 'develop' into simpler-dom

Conflicts:
extension/packages/button.coffee
extension/packages/find.coffee
extension/packages/button.coffee
extension/packages/mode-hints/hints.coffee
extension/packages/mode-hints/marker.coffee
extension/packages/utils.coffee
Imprint / Impressum