From: W. Trevor King <wking@tremily.us>
Date: Tue, 7 Oct 2014 18:47:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/execnet'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41f5c8703997d843d7b3c141a5fecec1df06b0f7;p=wtk-overlay.git

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

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

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

41f5c8703997d843d7b3c141a5fecec1df06b0f7
diff --cc dev-python/execnet/ChangeLog
index 0000000,1c55659..1c55659
mode 000000,100644..100644
--- a/dev-python/execnet/ChangeLog
+++ b/dev-python/execnet/ChangeLog
diff --cc dev-python/execnet/Manifest
index 0000000,7dd2373..7dd2373
mode 000000,100644..100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
diff --cc dev-python/execnet/execnet-1.1-r1.ebuild
index 0000000,4072ab5..4072ab5
mode 000000,100644..100644
--- a/dev-python/execnet/execnet-1.1-r1.ebuild
+++ b/dev-python/execnet/execnet-1.1-r1.ebuild
diff --cc dev-python/execnet/execnet-1.1.ebuild
index 0000000,ea78e8a..ea78e8a
mode 000000,100644..100644
--- a/dev-python/execnet/execnet-1.1.ebuild
+++ b/dev-python/execnet/execnet-1.1.ebuild
diff --cc dev-python/execnet/execnet-1.2.0-r1.ebuild
index 0000000,12e07cb..12e07cb
mode 000000,100644..100644
--- a/dev-python/execnet/execnet-1.2.0-r1.ebuild
+++ b/dev-python/execnet/execnet-1.2.0-r1.ebuild
diff --cc dev-python/execnet/metadata.xml
index 0000000,e0ad54d..e0ad54d
mode 000000,100644..100644
--- a/dev-python/execnet/metadata.xml
+++ b/dev-python/execnet/metadata.xml