projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b5bf15 ebca01f)
Merge branch 'gui'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 13:40:41 +0000 (15:40 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Mon, 9 Aug 2010 13:40:41 +0000 (15:40 +0200)
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp


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