projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c5b2a4e
55058bb
)
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
author
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 09:48:58 +0000
(11:48 +0200)
committer
Mateusz Półrola
<mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 09:48:58 +0000
(11:48 +0200)
Conflicts:
trunk/src/base/backbone/backbone.cpp
1
2
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
Simple merge
projects / mdictionary / commitdiff