summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-272-361/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
* \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-04-221-46/+76
|\ \ | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/gui/animation/qguivariantanimation.cpp
| * | Fixes for solution package.Jan-Arve Sæther2009-04-221-46/+76
| | |
* | | Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeuiMichael Brasser2009-04-221-9/+5
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | update the package script according to class renamingKent Hansen2009-04-211-4/+4
| | |
| * | remove QItemAnimation and add the interpolator for QColorThierry Bastian2009-04-201-0/+1
| | |
| * | cleanup in demoThierry Bastian2009-04-201-1/+0
| | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers
| * | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-175-0/+1684
| /
* | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+337
|/
* Long live Qt!Lars Knoll2009-03-234-0/+1353