Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts: # lib/common/util.h # programs/paramgrill.c # visual/2013/fullbench/fullbench.vcxproj.filters # visual/2013/fuzzer/fuzzer.vcxproj.filters
2016-05-10 13:20:01 +02:00
parent 349fcf7ea2 d693117113
commit ed9a08538c
28 changed files with 392 additions and 1442 deletions
@@ -423,7 +423,7 @@ static void BMK_loadFiles(void* buffer, size_t bufferSize,
        totalSize += (size_t)fileSize;
        fclose(f);
    }
-    
+
    if (totalSize == 0) EXM_THROW(12, "no data to bench");
 }