Merge remote-tracking branch 'origin/dev-python/derpconf'
authorW. Trevor King <wking@tremily.us>
Wed, 1 Oct 2014 11:55:13 +0000 (04:55 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 1 Oct 2014 11:55:13 +0000 (04:55 -0700)
commit5333a42d339d8fcfbec2bef5a9ac85cf48f13405
treec3d2e5f7586a402d614232fdf77a36101706f335
parent7b2ea7d0ea4ec14698be8d38030cf16b3a4a0d95
parent69a9490c0accbdbdec683a2cb0a53cca0e5160e9
Merge remote-tracking branch 'origin/dev-python/derpconf'

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

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