]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into proper-modes + Refactor
authorSimon Lydell <simon.lydell@gmail.com>
Thu, 5 Sep 2013 14:32:12 +0000 (16:32 +0200)
committerSimon Lydell <simon.lydell@gmail.com>
Thu, 5 Sep 2013 14:32:12 +0000 (16:32 +0200)
commit14b0c12f088b615089e2c7659317dd204bc51b68
treeb6b104243b1a4a96258d02c7205a8bdde86cf5ef
parent9ff7f32774fa1543b0c0cbf36c0a0d99915c3c59
parent93c1bbac7d9330ae667879e66c9c2bd15a7fbbd9
Merge branch 'develop' into proper-modes + Refactor

Conflicts:
extension/packages/commands.coffee
extension/packages/vim.coffee

The conflicts above required some refactoring to be resolved. Instead of
doing _just_ the refactoring required to get the code runnning again, I
continued with related refactoring, since it felt more sensible.
extension/packages/marker.coffee
extension/packages/modes.coffee
extension/packages/vim.coffee
extension/resources/style.css
Imprint / Impressum