[liblas] 03/03: Merge branch 'master' of git://anonscm.debian.org/pkg-grass/liblas

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository liblas.

commit 77bd95d4280956a6ec450b2804fced0f4c912199
Merge: f1d7408 f4a4877
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Thu Jul 31 21:55:52 2014 +0200

    Merge branch 'master' of git://anonscm.debian.org/pkg-grass/liblas
    
    Conflicts:
    	debian/patches/series

 debian/changelog                                   |    5 +-
 debian/liblas-bin.install                          |    4 -
 debian/liblas-bin.manpages                         |    4 -
 debian/man/las2las-old.1.xml                       |  528 -----
 debian/man/las2txt-old.1.xml                       |  160 --
 debian/man/lasinfo-old.1.xml                       |  362 ----
 debian/man/lasmerge.1.xml                          |  174 --
 ...ols-utilities-that-don-t-belong-in-liblas.patch | 2201 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 9 files changed, 2205 insertions(+), 1234 deletions(-)

diff --cc debian/patches/series
index f7f8bed,adda01a..7ef2144
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,4 +2,5 @@@ boos
  soversion
  fix_library_search
  separator-typo
+ 0001-remove-old-LAStools-utilities-that-don-t-belong-in-liblas.patch
 +update_gdal_geotiff.patch

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