summaryrefslogtreecommitdiffstats
path: root/tools/qmldebugger/standalone/canvasframerate.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-301-0/+40
|\ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp
| * fix headersWarwick Allison2009-10-291-0/+40
| |
* | Make private headers _pAaron Kennedy2009-10-301-1/+1
|/
* Move qmldebugger/ into qmldebugger/standalone dir.Bea Lam2009-10-271-0/+46