diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:54 +0200 |
| commit | a5ca4a64ac54a2bc67421a74d2caf5f085d26861 (patch) | |
| tree | 54b867facb4601a5597336f08f1c999c02087e9d /src/svg/qsvgstyle_p.h | |
| parent | 5795eaf936ca43306c3bcaf53cf943de01fa796f (diff) | |
| parent | ed11da0e216c84c4950f57cf9d9d262221050d4f (diff) | |
| download | qtsvg-a5ca4a64ac54a2bc67421a74d2caf5f085d26861.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I6036f0aa9166f6e7f57192ae92fb2c1322df3845
Diffstat (limited to 'src/svg/qsvgstyle_p.h')
0 files changed, 0 insertions, 0 deletions