diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-08 07:57:45 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-07-08 07:57:45 (GMT) |
| commit | 978e22d6529d7cbe9472749352d632eefd22cd07 (patch) | |
| tree | ac92a4f489c0a93a48eb502457c679659e472ac0 /src/declarative/graphicsitems/qdeclarativepath_p.h | |
| parent | cb11bb0df08f134bbded52fd4140197a01570a0e (diff) | |
| parent | 1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff) | |
| download | Qt-978e22d6529d7cbe9472749352d632eefd22cd07.zip Qt-978e22d6529d7cbe9472749352d632eefd22cd07.tar.gz Qt-978e22d6529d7cbe9472749352d632eefd22cd07.tar.bz2 | |
Merge remote branch 'mainline/4.8' into staging
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepath_p.h')
0 files changed, 0 insertions, 0 deletions