summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-17 11:17:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-17 12:33:27 +0100
commitf6c92aacb32721a4a22bd803e53c7a4d3dc2635f (patch)
treee4475f949df76e1b36a751dcb1ec92efae814820 /src/declarative
parent251c020bbc5594f88b0dfab9b73afa28d8743754 (diff)
parent047191f1d23b27cf68e8f0db24ff918fb465b70b (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions