projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a8af754
3511342
)
Merge branch 'xdxf' of ssh://drop.maemo.org/git/mdictionary into gui
author
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 10:53:32 +0000
(12:53 +0200)
committer
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Wed, 4 Aug 2010 10:53:32 +0000
(12:53 +0200)
1
2
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
Simple merge