From: W. Trevor King Date: Wed, 1 Oct 2014 11:56:08 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/dev-python/thumbor-pexif' X-Git-Url: http://git.tremily.us/?p=wtk-overlay.git;a=commitdiff_plain;h=1f99b97f4b1c5af39c1704abbf40a5b389d3a1c2 Merge remote-tracking branch 'origin/dev-python/thumbor-pexif' Pull in this per-package branch with a subtree merge [1]: $ git merge -s ours --no-commit origin/dev-python/thumbor-pexif $ git read-tree --prefix=dev-python/thumbor-pexif/ -u origin/dev-python/thumbor-pexif $ git commit -v so folks who aren't using a version of Layman that supports submodules (currently everybody) can use this modular package. [1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html --- 1f99b97f4b1c5af39c1704abbf40a5b389d3a1c2 diff --cc dev-python/thumbor-pexif/thumbor-pexif-9999.ebuild index 0000000,5030923..5030923 mode 000000,100644..100644 --- a/dev-python/thumbor-pexif/thumbor-pexif-9999.ebuild +++ b/dev-python/thumbor-pexif/thumbor-pexif-9999.ebuild