projects / tools / git-buildpackage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31a52b2 06e10c8)
Handle conflicts from git merge master 19/81319/1 devel_psk_20160727
authorSoonKyu Park <sk7.park@samsung.com>
Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Mon, 25 Jul 2016 11:53:31 +0000 (20:53 +0900)
Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1

1  2 
debian/changelog patch | diff1 | diff2 | blob | history
debian/control patch | diff1 | diff2 | blob | history
gbp/scripts/buildpackage_rpm.py patch | diff1 | diff2 | blob | history
packaging/git-buildpackage.changes patch | diff1 | diff2 | blob | history
packaging/git-buildpackage.spec patch | diff1 | diff2 | blob | history

diff --cc debian/changelog
index bbd64edb69de51179555f9fe746223f66977751c,581544d67bcb1a48c822133eb022941b4dd1476f..581544d67bcb1a48c822133eb022941b4dd1476f
mode 100755,100644..100755
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
diff --cc debian/control
index 3bae38870525858436f059fa1274a62f55b457b8,e5c828c9db59b0d4a8a77c501f30812844d6183c..e5c828c9db59b0d4a8a77c501f30812844d6183c
mode 100755,100644..100755
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
diff --cc gbp/scripts/buildpackage_rpm.py
Simple merge
diff --cc packaging/git-buildpackage.changes
index 5f8ecf5526aedba13213a7efe45e93bf5459d5e3,7f8a5ef3686ba7b91b4ba00ecfc82a9491db2c7e..7f8a5ef3686ba7b91b4ba00ecfc82a9491db2c7e
mode 100755,100644..100755
--- 1/packaging/git-buildpackage.changes
--- 2/packaging/git-buildpackage.changes
+++ b/packaging/git-buildpackage.changes
diff --cc packaging/git-buildpackage.spec
index bc6c190f4356bde7612e529a2204a24f540c9947,6093960214756170a21623aa5be257beed95689c..6093960214756170a21623aa5be257beed95689c
mode 100755,100644..100755
--- 1/packaging/git-buildpackage.spec
--- 2/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
Domain: SCM / Build;