From: W. Trevor King <wking@tremily.us>
Date: Thu, 23 Oct 2014 22:49:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/thumbor'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14c8e6b8b6457967dc28549b2216ed42b540b5c8;p=wtk-overlay.git

Merge remote-tracking branch 'origin/dev-python/thumbor'

Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/thumbor
  $ git read-tree --prefix=dev-python/dev-python/thumbor/ -u origin/dev-python/thumbor
  $ 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
---

14c8e6b8b6457967dc28549b2216ed42b540b5c8
diff --cc dev-python/thumbor/files/init.d/thumbor
index 0000000,77b848e..77b848e
mode 000000,100755..100755
--- a/dev-python/thumbor/files/init.d/thumbor
+++ b/dev-python/thumbor/files/init.d/thumbor
diff --cc dev-python/thumbor/thumbor-9999.ebuild
index 0000000,71e3113..71e3113
mode 000000,100644..100644
--- a/dev-python/thumbor/thumbor-9999.ebuild
+++ b/dev-python/thumbor/thumbor-9999.ebuild