diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:22:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2013-08-20 19:24:31 +0200 |
| commit | 3dbfd45f6f278f8e521fa9f035acf5310102b836 (patch) | |
| tree | f16cd11ceba046eb9d15872153d482fe81965c31 /examples/quick/controls/text/src | |
| parent | b3f1ed3b3b359722dc692256cbb3b89818bab49b (diff) | |
| parent | 09b0cb956940f45deaf35392630bd05453558d43 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I97e6044a5d28ab875628e61ea67474f3c0a4ef4b
Diffstat (limited to 'examples/quick/controls/text/src')
0 files changed, 0 insertions, 0 deletions