diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:02:10 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:25:40 +0200 |
commit | a257b0ee55c250889707bead9157076a3ff9b869 (patch) | |
tree | 37b707cd9e28de70e962fc4362ecbf0e3a40a779 /qttools.pro | |
parent | f212e46fe930ee89a8cb52beeeccc03369c015a1 (diff) | |
parent | 1b02287e464efc999dda10ff57c0207e6f3648d5 (diff) |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
src/assistant/assistant/assistant.pro
Change-Id: Ifa7d318f8482c09367388d6c9f848c4931a5ead7
Diffstat (limited to 'qttools.pro')
0 files changed, 0 insertions, 0 deletions