[PHP-DEV] force push in php-src

2017-01-12 Thread Ferenc Kovacs
hi, we had a wrong merge in the php-src, merging master into PHP-7.1. I've just force pushed the last good version before the bogus merge( 6fbd61a8199fbac9aac25d0dfaf1402a8f2b4e7b). You can find the bogus state at https://github.com/Tyrael/php-src/tree/7.1.0-broken if you happen to have some commi

[PHP-DEV] force push in php-src

2016-07-20 Thread Ferenc Kovacs
hi, we had a wrong merge in the php-src, merging master into 5.6. I've just force pushed the last good version before the bogus merge. You can find the bogus state at https://github.com/tyrael/php-src/tree/broken-5.6-20140206 if you happen to have some commits which you still want to have in PHP-5