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)
commit77958da8a32b9f39356684e05842579a74c4a46f
treeb4babcbfce543e21abfa2fb09049d546cb049481
parent31a52b28de3581b2859fd020a0d221d54d8e57f7
parent06e10c8b1f4f355e884d52a61b7762e733975d55
Handle conflicts from git merge master

Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
debian/changelog
debian/control
gbp/scripts/buildpackage_rpm.py
packaging/git-buildpackage.changes
packaging/git-buildpackage.spec