Post 0.7 release master back into develop

vtsuperdarn / davitpy

DEPRECATED The DaViT Python project

http://vtsuperdarn.github.com/davitpy/

GNU General Public License v3.0

37 stars 59 forks source link

Post 0.7 release master back into develop #310

Closed ksterne closed 7 years ago

ksterne commented 7 years ago

I don't think there was any real commits aside from the merge conflict resolution that should be done here. Though I see there's a couple of files relating to the mac installation of basemap. Anyone care to clarify this and merge it in if this is good?

ksterne commented 7 years ago

Anyone care to make this happen or should I self merge here?

Shirling-VT commented 7 years ago

Just merged.