diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 18:32:20 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-15 18:32:20 +0200 |
| commit | 26e3de575f99bdb6fe36f55495974a1c949c8ca4 (patch) | |
| tree | 0a3af517a1eccf860d52c1d36f7023be17558c89 /src/corelib/io/qprocess.cpp | |
| parent | 12905fa30f3b92d28dff0e4dc6f32ea516cc42f6 (diff) | |
| parent | 5b32132762cdaeb558833d5e36629b4248d4be48 (diff) | |
Merge branch 'release' into stable
Conflicts:
src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
Change-Id: I1a92b0c0dc1f7bad947a54fdd3ea7cfd6a5a7694
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
0 files changed, 0 insertions, 0 deletions