Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/PDAL/PDAL into point-cont…
Browse files Browse the repository at this point in the history
…ext-schema

Conflicts:
	scripts/ci/before_install.sh
	src/drivers/pgpointcloud/Reader.cpp
  • Loading branch information
abellgithub committed Aug 21, 2014
2 parents 34d6c66 + d123a62 commit a17169a
Show file tree
Hide file tree
Showing 3 changed files with 656 additions and 1 deletion.
6 changes: 5 additions & 1 deletion scripts/ci/before_install.sh
Expand Up @@ -50,7 +50,11 @@ if [[ $PDAL_OPTIONAL_COMPONENTS == "all" ]]
then
sudo apt-get install libgdal1h libgdal-dev libhdf5-serial-dev
sudo apt-get install \
libproj-dev libgeos++-dev \
libgdal1h \
libgdal-dev \
libhdf5-serial-dev \
libproj-dev \
libgeos++-dev \
python-numpy \
libxml2-dev \
libflann-dev \
Expand Down

0 comments on commit a17169a

Please sign in to comment.