[udunits] 01/05: Merge tag 'upstream_2.2.19'

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository udunits.

commit 61fd6a0810e8b29879198ba24a87c89a712d6924
Merge: 69b43e8 e43a03b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 4 15:07:44 2015 +0100

    Merge tag 'upstream_2.2.19'

 CHANGE_LOG                |  74 ++++---
 CMakeLists.txt            |   2 +-
 configure                 |  20 +-
 configure.ac              |   2 +-
 lib/Makefile.am           |   1 +
 lib/Makefile.in           |  28 +--
 lib/converter.c           |  13 +-
 lib/idToUnitMap.c         |   5 +-
 lib/scanner.c             |   3 +
 lib/udunits2-accepted.xml |  66 ++++--
 lib/udunits2-base.xml     |  45 +---
 lib/udunits2-common.xml   | 551 ++++++++++++++++++++++++++++++++++++----------
 lib/udunits2-derived.xml  |  93 +++++---
 lib/udunits2-prefixes.xml |   4 +-
 lib/udunits2lib.pdf       | Bin 270660 -> 270660 bytes
 lib/unitToIdMap.c         |  13 +-
 lib/unitcore.c            |   1 +
 lib/xml.c                 |   7 +-
 prog/Makefile.am          |   3 +
 prog/Makefile.in          |  12 +-
 prog/udunits2.c           |  34 +--
 prog/udunits2prog.pdf     | Bin 71512 -> 71512 bytes
 stamp-vti                 |   8 +-
 udunits2.html             |  10 +-
 udunits2.info             |  37 ++--
 udunits2.pdf              | Bin 118044 -> 117913 bytes
 version.texi              |   8 +-
 27 files changed, 726 insertions(+), 314 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/udunits.git