Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
tests/json/CMakeLists.txt
Description
Description
Details
Details
- Committed
kfunk Apr 16 2014, 2:37 PM - Parents
- R32:e69b005b24db: Remove the slowest iterations of the quickopen benchmarks
R32:80dc80ee77af: Port to KDELibs4Support - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e69b005b24db | brauch | Remove the slowest iterations of the quickopen benchmarks | Apr 16 2014 | |||
| db0f505f8fe6 | kfunk | Don't add QJSON to public link interface | Apr 16 2014 |