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

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

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

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

7b2ea7d0ea4ec14698be8d38030cf16b3a4a0d95
diff --cc dev-python/pyvows/Manifest
index 0000000,7f473a6..7f473a6
mode 000000,100644..100644
--- a/dev-python/pyvows/Manifest
+++ b/dev-python/pyvows/Manifest
diff --cc dev-python/pyvows/pyvows-2.0.3.ebuild
index 0000000,721a48c..721a48c
mode 000000,120000..120000
--- a/dev-python/pyvows/pyvows-2.0.3.ebuild
+++ b/dev-python/pyvows/pyvows-2.0.3.ebuild
diff --cc dev-python/pyvows/pyvows-9999.ebuild
index 0000000,a949b13..a949b13
mode 000000,100644..100644
--- a/dev-python/pyvows/pyvows-9999.ebuild
+++ b/dev-python/pyvows/pyvows-9999.ebuild