[pyshp] 02/10: Merge tag 'upstream/1.2.1'

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository pyshp.

commit ae96248eb6c6e7cbeee3cf6f7d7c24a360ebd3c3
Merge: 15bdc66 7d4ec31
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Wed Aug 13 20:58:43 2014 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1
    
    # gpg: Signature made Wed 13 Aug 2014 08:58:32 PM CEST using RSA key ID A68910FC
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"

 MANIFEST.in                 |    1 +
 PKG-INFO                    |  184 +-
 README.html                 |  835 +++++++++
 README.pdf                  | 4130 +++++++++++++++++++++++++++++++++++++++++++
 README.txt                  |  182 +-
 changelog.txt               |   69 +
 pyshp.egg-info/PKG-INFO     |  184 +-
 pyshp.egg-info/SOURCES.txt  |   20 +-
 setup.py                    |    2 +-
 shapefile.py                |  255 ++-
 shapefiles/blockgroups.dbf  |  Bin 236775 -> 0 bytes
 shapefiles/blockgroups.sbn  |  Bin 6836 -> 0 bytes
 shapefiles/blockgroups.sbx  |  Bin 540 -> 0 bytes
 shapefiles/blockgroups.shp  |  Bin 208572 -> 0 bytes
 shapefiles/blockgroups.shx  |  Bin 5404 -> 0 bytes
 shapefiles/test/line.dbf    |  Bin 259 -> 0 bytes
 shapefiles/test/line.shp    |  Bin 372 -> 0 bytes
 shapefiles/test/line.shx    |  Bin 116 -> 0 bytes
 shapefiles/test/point.dbf   |  Bin 552 -> 0 bytes
 shapefiles/test/point.shp   |  Bin 240 -> 0 bytes
 shapefiles/test/point.shx   |  Bin 140 -> 0 bytes
 shapefiles/test/polygon.dbf |  Bin 259 -> 0 bytes
 shapefiles/test/polygon.shp |  Bin 236 -> 0 bytes
 shapefiles/test/polygon.shx |  Bin 108 -> 0 bytes
 24 files changed, 5733 insertions(+), 129 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyshp.git