projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: eb48005)
Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict
authorjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 10:09:29 +0000 (11:09 +0100)
committerjakub <jakub.jaszczynski@comarch.com>
Thu, 18 Nov 2010 10:09:29 +0000 (11:09 +0100)
Conflicts:
src/plugins/stardict/StarDialog.cpp
src/plugins/stardict/StarDictPlugin.cpp
src/plugins/stardict/en_US.ts
src/plugins/stardict/pl_PL.ts


No differences found
Unnamed repository; edit this file to name it for gitweb.