Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 1 | -16/+16 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | -16/+16 |
| | | |||||
* | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -3/+3 |
|/ | |||||
* | Test cleanup. | Michael Brasser | 2009-05-25 | 2 | -0/+701 |