]> git.gir.st - VimFx.git/commit
Merge branch 'develop' into huffman
authorSimon Lydell <simon.lydell@gmail.com>
Mon, 29 Jul 2013 19:21:10 +0000 (21:21 +0200)
committerSimon Lydell <simon.lydell@gmail.com>
Mon, 29 Jul 2013 19:21:10 +0000 (21:21 +0200)
commit8d9c6f658fbe39ea7080bb2f03e108acbcdf8a17
treebfe60866e8637e5a91aee77fb605df17b636323d
parent391dc412f6ed47904ae09a1624efc1a2e8e809a5
parentd9990a7015473053161a836ff75707c57d2309c9
Merge branch 'develop' into huffman

Conflicts:
extension/locale/hu-HU/options.dtd
extension/packages/prefs.coffee
extension/locale/en-US/options.dtd
extension/locale/hu/options.dtd
extension/locale/pl/options.dtd
extension/locale/ru/options.dtd
extension/locale/zh-CN/options.dtd
extension/packages/prefs.coffee
extension/packages/utils.coffee
Imprint / Impressum