[pdal-commits] [PDAL/PDAL] 271775: bad merge fixup

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/PDAL/PDAL
  Commit: 271775992abbad0270f591d04c4fc0bab7a70b96
      https://github.com/PDAL/PDAL/commit/271775992abbad0270f591d04c4fc0bab7a70b96
  Author: Howard Butler <howard at hobu.co>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M scripts/docker/Dockerfile

  Log Message:
  -----------
  bad merge fixup


  Commit: 413f5ef5c44ff547c530cbdc6b3130d095e3b4b1
      https://github.com/PDAL/PDAL/commit/413f5ef5c44ff547c530cbdc6b3130d095e3b4b1
  Author: Howard Butler <howard at hobu.co>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M filters/mongus/MongusFilter.cpp

  Log Message:
  -----------
  warnings cleanups in mongus


  Commit: d499b2c0a817d7af2d57d6188fb7deec6118a3c5
      https://github.com/PDAL/PDAL/commit/d499b2c0a817d7af2d57d6188fb7deec6118a3c5
  Author: Howard Butler <howard at hobu.co>
  Date:   2016-08-26 (Fri, 26 Aug 2016)

  Changed paths:
    M plugins/greyhound/io/GreyhoundReader.cpp

  Log Message:
  -----------
  use correct type for m_splitCountThreshold


Compare: https://github.com/PDAL/PDAL/compare/f2523322b6a6...d499b2c0a817