[Liblas-commits] hg: merge

[liblas-commits at liblas.org]

changeset 4c5d01d383b1 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=4c5d01d383b1
summary: merge

diffstat:

 README          |  2 +-
 src/Makefile.am |  1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r d217232380f4 -r 4c5d01d383b1 README
--- a/README	Mon Jan 18 13:56:06 2010 -0600
+++ b/README	Mon Jan 18 14:33:43 2010 -0600
@@ -1,4 +1,4 @@
-   
+    
 libLAS - LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset
 ==============================================================================
 
diff -r d217232380f4 -r 4c5d01d383b1 src/Makefile.am
--- a/src/Makefile.am	Mon Jan 18 13:56:06 2010 -0600
+++ b/src/Makefile.am	Mon Jan 18 14:33:43 2010 -0600
@@ -38,6 +38,7 @@
 	lasfile.cpp \
 	las_c_api.cpp \
 	lasspatialreference.cpp \
+	lasformat.cpp \
 	detail/reader.cpp \
 	detail/reader10.cpp \
 	detail/reader11.cpp \