towards 4.1

[Dirk Hohndel]

On Apr 19, 2014, at 12:49 PM, Jef Driesen <jef at libdivecomputer.org> wrote:

>> When I did a quick look it seemed to me that 0.4.2 had fixes that were not in
>> master, that’s why I picked 0.4.2. Did I manage to confuse myself?
> 
> I merged the release-0.4 branch into master immediately after the v0.4.2 release. So unless I screwed up big time, everything from v0.4.2 should be in master too.

No, you are correct and I messed up. For my “quick look” I looked at my local branch
and didn’t realize that I hadn’t pulled the latest upstream master. My mistake. You
are correct, 0.4.2 has been pulled into master and I think I’ll switch to master for
the binaries for Windows and Mac

Thanks, Jef

/D