Merge commit 'upstream/1.3.0'
authorBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 20:38:53 +0000 (14:38 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 20:38:53 +0000 (14:38 -0600)
commit68a3cad00312b42922f10cc4822349802f50ed20
tree410b8bb3ce5b913043f6a592180d564a51c05fd1
parent0fe7930a10436ce250cae6daf2077415f8727af6
parent18b0073296be2b71aa95c3c2441f717279d09eab
Merge commit 'upstream/1.3.0'

Conflicts:
CHANGES
README
build
clean
configure
docs/english/man/splat.1
docs/english/man/splat.man
docs/english/pdf/splat.pdf
docs/english/postscript/splat.ps
docs/english/text/splat.txt
docs/spanish/man/splat.1
docs/spanish/man/splat.man
docs/spanish/pdf/splat.pdf
docs/spanish/postscript/splat.ps
docs/spanish/text/splat.txt
install
splat-1.2.1.lsm
splat.cpp
utils/README
utils/build
utils/install
utils/postdownload
utils/srtm2sdf.c
utils/usgs2sdf.c
build