diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-23 12:24:59 +0200 |
| commit | 433e143b231a7cc7f1b37ce85d5ee6c3e06efab0 (patch) | |
| tree | 6e89a975e9d569b69239059c7a0d0efe0fcb2687 /qtactiveqt | |
| parent | e39f4e8b4be5da3d549c740ba396576bff7f952d (diff) | |
| parent | acd97fec50d85bc9c82ea5ab49072acf992a0d0b (diff) | |
Merge branch 'dev' into stable
Conflicts:
qtjsbackend
Diffstat (limited to 'qtactiveqt')
| m--------- | qtactiveqt | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtactiveqt b/qtactiveqt -Subproject 356b272b7afe4512becadf1bcefbcae9366fb00 +Subproject b29d07c554e5beed0e88b8d75fc42b40b77fee6 |