From: W. Trevor King <wking@tremily.us>
Date: Wed, 1 Oct 2014 11:57:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/asyncio'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6fb00ae8e483070b0a5ecc4fe8ee26d933fcc6cd;p=wtk-overlay.git

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

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

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

6fb00ae8e483070b0a5ecc4fe8ee26d933fcc6cd
diff --cc dev-python/asyncio/Manifest
index 0000000,ac8ee37..ac8ee37
mode 000000,100644..100644
--- a/dev-python/asyncio/Manifest
+++ b/dev-python/asyncio/Manifest
diff --cc dev-python/asyncio/asyncio-3.4.1.ebuild
index 0000000,ae27636..ae27636
mode 000000,120000..120000
--- a/dev-python/asyncio/asyncio-3.4.1.ebuild
+++ b/dev-python/asyncio/asyncio-3.4.1.ebuild
diff --cc dev-python/asyncio/asyncio-9999.ebuild
index 0000000,cab3565..cab3565
mode 000000,100644..100644
--- a/dev-python/asyncio/asyncio-9999.ebuild
+++ b/dev-python/asyncio/asyncio-9999.ebuild