summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@digia.com>2014-04-01 11:46:57 +0300
committerIikka Eklund <iikka.eklund@digia.com>2014-04-01 11:46:58 +0300
commit91697f5ce50604f29e4d61e921cfab60eeaf8a61 (patch)
tree3b3c9a062f209931a43241b19d8603b1ca3a023d /src/plugins
parentec7b40e87a2b129ccecf5bc46b5f84cf5563291c (diff)
parent292a6707e565f226314fba541b3cdeaef5046d4e (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions