merging from Qt into master

Dirk Hohndel dirk at hohndel.org
Sun Apr 7 09:19:42 PDT 2013


Henrik convinced me to actually track the changes to the core logic in
master (and to also cherry-pick commits that fix real issues). So I did
just that with the divelist split and one of Alberto's commits.

This way it's easier to a) make sure that the logic separation code is
correct and doesn't break functionality and b) to track fixes that are
made on either branch.

I know that Linus dislikes cherry picking between branches like that,
but it does seem like a good way to deal with this process - at least as
long as this doesn't require us to make unnatural choices on the Qt
branch.


/D


More information about the subsurface mailing list