projects / tools / git-buildpackage.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e7c90b 7d042a8)
Handle conflicts from git merge release-20160531 release-20160615 release-20160930
authorSoonKyu Park <sk7.park@samsung.com>
Thu, 16 Jun 2016 08:32:15 +0000 (17:32 +0900)
committerSoonKyu Park <sk7.park@samsung.com>
Thu, 16 Jun 2016 08:32:15 +0000 (17:32 +0900)
Change-Id: I1cae90068ab2576d756188e36e112550c7c293de


Trivial merge
Domain: SCM / Build;