From: Bdale Garbee <bdale@gag.com>
Date: Tue, 8 Sep 2009 20:38:53 +0000 (-0600)
Subject: Merge commit 'upstream/1.3.0'
X-Git-Tag: debian/1.3.0-1~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=68a3cad00312b42922f10cc4822349802f50ed20;p=debian%2Fsplat

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
---

68a3cad00312b42922f10cc4822349802f50ed20