diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-07 06:57:21 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-07 06:57:21 (GMT) |
| commit | a3a6e1622149654bc9e244e685e8e7dcbdf966b2 (patch) | |
| tree | 1c4fe9feab63839213a0d97e9b24414c9585a227 /src/declarative/util/qfxperf_p.h | |
| parent | 99573a8e81fcea38c5f68b340068fff266315c03 (diff) | |
| parent | 8b0cac9179de4d1cb34b9f17932d34cef3cd4f5b (diff) | |
| download | Qt-a3a6e1622149654bc9e244e685e8e7dcbdf966b2.zip Qt-a3a6e1622149654bc9e244e685e8e7dcbdf966b2.tar.gz Qt-a3a6e1622149654bc9e244e685e8e7dcbdf966b2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into test
Conflicts:
demos/declarative/samegame/content/samegame.js
tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
Diffstat (limited to 'src/declarative/util/qfxperf_p.h')
0 files changed, 0 insertions, 0 deletions