Changed ND2 metadata string handling to work properly with empty strings
Merge pull request #1467 from rleigh-dundee/cmake-xerces

cmake: Replace FindXerces with FindXercesC
Merge pull request #1469 from rleigh-dundee/cpp-pixelprop-warnings

cpp: bioformats: Correct placement of warning pragmas in PixelProperties
Merge pull request #1468 from rleigh-dundee/cpp-showinf-fixes

C++: binary build and showinf fixes
cpp: compat: Add boolean type
cpp: bioformats: Work around doxygen doc warnings

Some inline template methods are marked as undocumented even when the
prototype is fully documented.  And this is not even consistent for
all the methods of this type.  This just removes warnings for some
doxygen versions.
cpp: xerces: Minor whitespace fix in EntityResolver
Enter correct value.
Merge pull request #1457 from melissalinkert/im3

IM3: fix memoization and whitespace
Merge pull request #1465 from melissalinkert/12367

NDPI: fix tile offset adjustment for files larger than 4GB
Merge pull request #1460 from rleigh-dundee/cpp-metadata3

C++: Implement MetadataConverter
Merge pull request #1420 from qidane/some-units-samples

Updating samples and adding units samples
merge develop -Dorg -Ssuccess-only: PR 1407 (TIFF: fix plane count calculation for pyramids with multiple planes)
merge develop -Dorg -Ssuccess-only: PR 1442 (Update roi handler)
merge develop -Dorg -Ssuccess-only: PR 1461 (Changed ND2 metadata string handling to work properly with empty strings)
merge develop -Dorg -Ssuccess-only: PR 1471 (mock object)
merge develop -Dorg -Ssuccess-only: PR 1472 (cpp: compat: Add boolean type)
merge develop -Dorg -Ssuccess-only: PR 1473 (C++: Minor documentation and whitespace fixes)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 1458 sbesson 'Fix Javadocs warnings' (status: pending)
  # PR 1443 joshmoore 'Genshi ZIP' (label: exclude)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 1474 sbesson 'Add bash script for updating copyright headers (rebased onto dev_5_0) (rebased onto develop)' (status: pending)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
  # PR 1015 qidane 'Messy binary' (exclude comment)
Updating 5ddef64..a0565c9
Previously merged:
  # PR 1420 qidane 'Updating samples and adding units samples'
  # PR 1460 rleigh-dundee 'C++: Implement MetadataConverter'
  # PR 1465 melissalinkert 'NDPI: fix tile offset adjustment for files larger than 4GB'
  # PR 1457 melissalinkert 'IM3: fix memoization and whitespace'
  # PR 1468 rleigh-dundee 'C++: binary build and showinf fixes'

Merged PRs:
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1442 bramalingam 'Update roi handler'
  # PR 1461 csachs 'Changed ND2 metadata string handling to work properly with empty strings'
  # PR 1471 jburel 'mock object'
  # PR 1472 rleigh-dundee 'cpp: compat: Add boolean type'
  # PR 1473 rleigh-dundee 'C++: Minor documentation and whitespace fixes'

Generated by OME-5.1-merge-push#636 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/636/)
Update auto-generated documentation

Repository: snoopycrimecop/bioformats

Generated by BIOFORMATS-5.1-merge-docs-autogen#129 (http://ci.openmicroscopy.org/job/BIOFORMATS-5.1-merge-docs-autogen/129/)