projects
/
platform
/
upstream
/
libzypp-bindings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58d073c
6b3959b
)
fix merge conflict in CMakeLists.txt
author
Klaus Kämpf
<kkaempf@suse.de>
Tue, 9 Nov 2010 10:16:12 +0000
(11:16 +0100)
committer
Klaus Kämpf
<kkaempf@suse.de>
Tue, 9 Nov 2010 10:16:12 +0000
(11:16 +0100)
1
2
swig/zypp.i
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
swig/zypp.i
Simple merge
projects / platform / upstream / libzypp-bindings.git / commitdiff