projects / wtk-overlay.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0b13f4 daafb04)
Merge branch 'dev-python/pexif'
authorW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:29:28 +0000 (14:29 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:29:28 +0000 (14:29 -0700)
commitd7e32a9f5161c0774f8b49221860c6a7e16a55a5
treedf8e5dd6e5c9d5efbf77d6bd1b1dfaf8e2ab6616tree | snapshot
parentf0b13f4a10ca5c5163f171161efe3111575c9085commit | diff
parentdaafb0468609acec28d9a4d517cdd0736a49cd71commit | diff
Merge branch 'dev-python/pexif'

Replacing the obsolete thumbor-pexif.

* dev-python/pexif:
  pexif-9999.ebuild: Convert from thumbor-pexif to pexif

Conflicts:
dev-python/thumbor-pexif/thumbor-pexif-0.14.1.ebuild
dev-python/thumbor-pexif/thumbor-pexif-9999.ebuild
pexif-9999.ebuild
thumbor-pexif-9999.ebuild

The conflicts are due to the change in dev-python/* namespacing, and
were resolved by creating dev-python/pexif to exactly match the branch
and removing dev-python/thumbor-pexif.
dev-python/pexif/Manifest | diff2 | blob | history
dev-python/pexif/pexif-0.15.ebuild | diff2 | blob | history
dev-python/pexif/pexif-9999.ebuild diff1 | diff2 | blob | history
W. Trevor King's Gentoo overlay.