diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:26:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:26:50 +0100 |
| commit | f501e47a0f37ffb769e9b52a2c6373003f3fa40a (patch) | |
| tree | 6863e13476b172249764e5b3a74660756e4e7c1a /src | |
| parent | 7ebe6263c14ad517c73d0c082fc3e962364b8757 (diff) | |
| parent | ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2 (diff) | |
| download | qtsvg-f501e47a0f37ffb769e9b52a2c6373003f3fa40a.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id5bef032b66a051e3a6e707abae442ccd2610c84
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions