]> git.pld-linux.org Git - packages/rpm.git/commitdiff
projects / packages / rpm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf728d0 7ffaa76)
Merge branch 'master' into db52
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 23 Nov 2012 07:13:45 +0000 (08:13 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 23 Nov 2012 07:13:45 +0000 (08:13 +0100)
Conflicts:
rpm-db5.2.patch
rpm.spec

1  2 
rpm.spec patch | diff1 | diff2 | blob | history

diff --cc rpm.spec
Simple merge
RPM Package Manager
This page took 0.040153 seconds and 4 git commands to generate.