8 Commits

Author	SHA1	Message	Date
Sean Gillies	0cde25b9cd	Merge branch 'master' into issue242 ... Conflicts: rasterio/rio/merge.py	2015-01-13 20:50:28 -07:00
Sean Gillies	f686ccad70	Fix expected value for float test.	2015-01-13 17:36:24 -07:00
Sean Gillies	09582c7b8f	Watch out for undefined 'info'. ... Also get merge.py coverage back to 100% (nodata and floats).	2015-01-13 17:18:59 -07:00
Sean Gillies	2b4f7284ba	Working rio-merge with main features of gdal-merge.py ... Closes #242	2015-01-12 15:21:34 -07:00
Sean Gillies	9cd3cc049f	100% test coverage.	2015-01-07 22:48:32 -07:00
Sean Gillies	fbc3347f73	Logic and tests for merge without nodata. ... Closes #240	2015-01-07 22:26:38 -07:00
Brendan Ward	c03de30e58	Sort test input files	2014-12-31 07:17:15 -08:00
Brendan Ward	dc4d5106ce	Fixed proper handling of verbosity and output shape for rio merge	2014-12-30 23:03:01 -08:00