projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb17ab0
bec52fe
)
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
author
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 06:37:51 +0000
(08:37 +0200)
committer
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 7 Sep 2010 06:37:51 +0000
(08:37 +0200)
1
2
src/plugins/google/GooglePlugin.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/xdxf/XdxfLoadDialog.cpp
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/xdxf/XdxfLoadDialog.h
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/xdxf/XdxfSettingsDialog.h
patch
|
diff1
|
diff2
|
blob
|
history
src/plugins/xdxf/xdxfplugin.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/plugins/google/GooglePlugin.cpp
Simple merge
diff --cc
src/plugins/xdxf/XdxfLoadDialog.cpp
Simple merge
diff --cc
src/plugins/xdxf/XdxfLoadDialog.h
Simple merge
diff --cc
src/plugins/xdxf/XdxfSettingsDialog.h
Simple merge
diff --cc
src/plugins/xdxf/xdxfplugin.cpp
Simple merge