Merge remote-tracking branch 'origin/dev-python/south'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:46:16 +0000 (11:46 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:46:16 +0000 (11:46 -0700)
commit6b2fd225c3d3320c80e865744a522326d23ba0e1
treec38ca5d3693be8be985ebdef2828d25d14b084ab
parent0e6090dbb46c054543ff92df9e86c283b8c7fd21
parent9cd40193c542c90bf2339b656e428eaffeb89fbd
Merge remote-tracking branch 'origin/dev-python/south'

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

  $ git merge -s ours --no-commit origin/dev-python/south
  $ git read-tree --prefix=dev-python/dev-python/south/ -u origin/dev-python/south
  $ 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
13 files changed:
dev-python/south/ChangeLog
dev-python/south/Manifest
dev-python/south/files/south-0.7.5-tests.patch
dev-python/south/files/south-1.0-3753b49c-Replace-dict.iteritems-with-six.patch
dev-python/south/metadata.xml
dev-python/south/south-0.7.2.ebuild
dev-python/south/south-0.7.3.ebuild
dev-python/south/south-0.7.4.ebuild
dev-python/south/south-0.7.5-r1.ebuild
dev-python/south/south-0.7.5.ebuild
dev-python/south/south-0.7.6.ebuild
dev-python/south/south-0.8.1.ebuild
dev-python/south/south-1.0.ebuild