projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98e5260
b2719af
)
Merge branch 'gui'
author
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 07:05:42 +0000
(09:05 +0200)
committer
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 07:05:42 +0000
(09:05 +0200)
Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Trivial merge