Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 1 | -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 headers | Warwick Allison | 2009-10-29 | 1 | -0/+40 |
| | | |||||
* | | Make private headers _p | Aaron Kennedy | 2009-10-30 | 1 | -1/+1 |
|/ | |||||
* | Move qmldebugger/ into qmldebugger/standalone dir. | Bea Lam | 2009-10-27 | 1 | -0/+46 |