aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/plugins.pro
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-03-22 16:31:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-22 17:07:22 +0100
commit4390f9322e2601b0219c984168fe7b4ec340a498 (patch)
tree8b1a8e6dada17f01047cfab045e9ef8cfb7e5081 /src/plugins/plugins.pro
parentd2395a2237a48565b5ea50856e0fdeade703f206 (diff)
parent5ac2ce5f4810092cd2135663160017e81d6c96a4 (diff)
Merge "Merge remote-tracking branch 'origin/dev' into stable" into refs/staging/stable
Diffstat (limited to 'src/plugins/plugins.pro')
0 files changed, 0 insertions, 0 deletions