mmatts/mesonetDataTool — pull request #15 by Myoldmopar (2014-01-21 17:54:21+00:00)
Title: Major overhaul of date time section using calendar widgets

OK, this will be a good exercise. It says it can't automatically merge the branches, so that's one thing. It's possible this is because the file has changed so drastically, but I'm suspicious. It shouldn't be a line ending problem. But we'll see.