]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into proper-modes
authorSimon Lydell <simon.lydell@gmail.com>
Sat, 7 Sep 2013 10:45:44 +0000 (12:45 +0200)
committerSimon Lydell <simon.lydell@gmail.com>
Sat, 7 Sep 2013 10:45:44 +0000 (12:45 +0200)
commit8fe9283e6948c655c0911ff9c40686ab64a848c0
tree30438ae285c9c4e7b692c93a7f32ce90527854c3
parent752667a192693fcaba081030a405ef9b4a1af47b
parent00b5d9164199cdaade5d4bb7e909e68a5706b8a0
Merge branch 'develop' into proper-modes

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