projects / wtk-overlay.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92aedf6 5360ac7)
Merge branch 'dev-python/pyvows'
authorW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:32:54 +0000 (14:32 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 12 Aug 2016 21:32:54 +0000 (14:32 -0700)
commit10968c5bae0f7fadc40cb4de94790ed05d32dc7d
tree8736fec6dada3d80637cefe4640e746e023d4478tree | snapshot
parent92aedf6e1857ed78dd82d8ce2192af59a9f099becommit | diff
parent5360ac7cd2328339c7190101cb969112114f1deccommit | diff
Merge branch 'dev-python/pyvows'

* dev-python/pyvows:
  pyvows-9999.ebuild: Bump to EAPI 6 and git-r3

Conflicts:
dev-python/pyvows/pyvows-2.0.3.ebuild

The conflicts are due to the file addition/removal and thte local
dev-python/pyvows namespacing, and were resolved by removing
pyvows-2.0.3.ebuild and adding pyvows-2.1.0.ebuild.
dev-python/pyvows/Manifest diff1 | diff2 | blob | history
dev-python/pyvows/pyvows-2.1.0.ebuild | diff2 | blob | history
dev-python/pyvows/pyvows-9999.ebuild diff1 | diff2 | blob | history
W. Trevor King's Gentoo overlay.