On 05.03.2016, at 11:45, Daniel Frey wrote:

...

On 05.03.2016, at 11:17, Vicente J. Botet Escriba wrote:

Le 05/03/2016 09:02, Daniel Frey a écrit :

...

May I merge the ADL protection from develop to master for utility/operators?

If this is a fix you are yet on time.

It is just a fix, but I’m afraid merging produced some unexpected result :-/

If someone could have a look at the recent commit history, there is a commit from me about merging “develop” to “develop” and I have no idea why. It contains changes to string_ref.hpp and a bunch of other files. Could someone with more experience with git have a look and help to revert this to a sane state? Thanks. (I hate git. I looked at the changes before pushing them and this wasn’t there - now it is?!)

False alarm, master should be fine. I just realized I looked at the wrong branch’s history.