Merge remote-tracking branch 'upstream/master' git says about confilict of config.h and configure, these files are no longer used so no problem without merg...
Fork