]> git.gir.st - VimFx.git/commit
Merge branch 'master' into develop
authorSimon Lydell <simon.lydell@gmail.com>
Sun, 18 Jan 2015 20:44:08 +0000 (21:44 +0100)
committerSimon Lydell <simon.lydell@gmail.com>
Sun, 18 Jan 2015 20:44:08 +0000 (21:44 +0100)
commit77e2d36ebc7318f6fa57b1c5e1f7b5f1050ec0cf
tree7cf1f5ba92e165f77371fd24e187c30d52b7c34d
parentfc856cd407a49638d0e0be6efcaf893c0e3c3875
parenta8889571c1ca927bf5e8ff527454a995f7c22a3c
Merge branch 'master' into develop

Conflicts:
extension/locale/pl/options.dtd
extension/locale/pl/vimfx.properties
extension/locale/pl/options.dtd
extension/locale/pl/vimfx.properties
Imprint / Impressum