diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:34:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:34:36 +0200 |
| commit | 80604a0786628a0c57eac7cc856720537956cc7f (patch) | |
| tree | e31b9b56584e77d6aefd4dfd072ce4e8e3648f3d /tests/benchmarks/corelib | |
| parent | 1c901913c0af79b2bbde1b9da71f5267cb4fc76a (diff) | |
| parent | c11a7d16c7056da4086a87c9e85b89f8466be032 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
src/plugins/platforms/cocoa/qnsview.mm
Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
Diffstat (limited to 'tests/benchmarks/corelib')
0 files changed, 0 insertions, 0 deletions