projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7afbcf6 640585b)
Merge branch 'searching' of ssh://drop.maemo.org/git/mdictionary into searching
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 06:36:59 +0000 (08:36 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 06:36:59 +0000 (08:36 +0200)
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp


Trivial merge
Unnamed repository; edit this file to name it for gitweb.