Merge remote-tracking branch 'origin/dev-python/thumbor'
authorW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 22:49:48 +0000 (15:49 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 23 Oct 2014 22:49:48 +0000 (15:49 -0700)
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

1  2 
dev-python/thumbor/files/init.d/thumbor
dev-python/thumbor/thumbor-9999.ebuild

index 0000000000000000000000000000000000000000,77b848e57915c8f7c0940aea39c720ff5e75574c..77b848e57915c8f7c0940aea39c720ff5e75574c
mode 000000,100755..100755
--- /dev/null
index 0000000000000000000000000000000000000000,71e3113a1df7ad9969eda92e1948a10e5b3f12da..71e3113a1df7ad9969eda92e1948a10e5b3f12da
mode 000000,100644..100644
--- /dev/null