Merging 0.5-release Master 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

Merging 0.5-release Master into Develop #229

Closed asreimer closed 8 years ago

asreimer commented 8 years ago

This is a housekeeping pull request as a result of finishing and merging the 0.5-release of DaViT-py.

This pull makes sure that the develop branch is up to date with the new release of master.

ksterne commented 8 years ago

Good work here! Thanks for all the pulling and merging today.

asreimer commented 8 years ago

No problem. This was pretty easy! I think we should try to run all of our releases the way this one was done. No merge conflicts is a nice way to operate.