[protozero] 02/04: Merge tag 'upstream/1.2.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository protozero.

commit 1b0edbbebfe2fcbba024d153b899ed6e80cca427
Merge: 7015226 6ff79b0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 12 22:25:50 2015 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 CHANGELOG.md                   | 10 +++++++++-
 Makefile                       |  2 +-
 include/protozero/byteswap.hpp | 10 +---------
 include/protozero/version.hpp  |  4 ++--
 test/t/endian/test_cases.cpp   | 15 ---------------
 5 files changed, 13 insertions(+), 28 deletions(-)

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