Fixup

[annu13]

This PR only contains one change in file ess_base_std_orted.c, the rest of the commits are a result of some rebase and incorrect merge operations.

[artpol84]

@annu13 this is steel incorrect.
Commit list has to be just one commit. If you need to merge you're doing something wrong.
In short you need to checkout fresh master, push it as a new branch in your fork and apply you the only one commit. and then do the PR.

[rhc54]

@artpol84 I don't understand your concern - there is only one commit in this PR. This looks just fine.

[artpol84]

Now it's OK. Note that @annu13 has changed the PR after my comment (according to the timeline). It wasn't OK but now it's fine.

[rhc54]

Ah, ok - thx!

On Tue, Dec 22, 2015 at 9:01 PM, Artem Polyakov [email protected]
wrote:

Now it's OK. Note that @annu13 https://github.com/annu13 has changed
the PR after my comment (according to the timeline). It wasn't OK but now
it's fine.

—
Reply to this email directly or view it on GitHub
#1255 (comment).