projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04a2067 804dc59)
Merge branch 'bookmarks'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 13:16:41 +0000 (15:16 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 13:16:41 +0000 (15:16 +0200)
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp


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