[Python-modules-commits] [python-exif] 02/04: Merge tag 'upstream/2.1.2'

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository python-exif.

commit 11f19c707edbc8f6c8facb0a565401dc7d8b00af
Merge: 18edfc5 8b3f30b
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Nov 26 10:35:02 2015 +0900

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2
    
    # gpg: 2015年11月26日 10時35分02秒 JSTにRSA鍵ID 28A5E257で施された署名
    # gpg: “TANIGUCHI Takaki <takaki at media-as.org>”からの正しい署名
    # gpg:                 別名“TANIGUCHI Takaki <takaki at asis.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <taniguchi.takaki at gmail.com>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at debian.or.jp>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at takaki.media-as.org>”
    # gpg:                 別名“TANIGUCHI Takaki <takaki at nagoya-u.jp>”

 .gitattributes                                     |  11 -
 .gitignore                                         |  53 --
 ChangeLog.rst                                      |   5 +
 EXIF.py                                            |   2 +-
 exifread/__init__.py                               |   2 +-
 exifread/classes.py                                |  27 +-
 exifread/tags/__init__.py                          |   2 +-
 exifread/tags/exif.py                              |   4 +-
 exifread/tags/makernote.py                         | 608 ---------------------
 exifread/tags/makernote/__init__.py                |  10 +
 .../{makernote_apple.py => makernote/apple.py}     |   0
 .../{makernote_canon.py => makernote/canon.py}     |   0
 exifread/tags/makernote/casio.py                   |  64 +++
 .../fujifilm.py}                                   |   2 +-
 exifread/tags/makernote/nikon.py                   | 247 +++++++++
 exifread/tags/makernote/olympus.py                 | 291 ++++++++++
 16 files changed, 638 insertions(+), 690 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-exif.git