3 Commits

Author SHA1 Message Date
Sean Gillies
12261402fb Incorporating @brendan-ward's suggestions. 2015-01-13 12:51:10 -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
84ad697d47 Merge remote-tracking branch 'origin' into issue190
Conflicts:
	rasterio/_io.pyx
2014-12-19 19:53:42 -07:00