Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-31 | 21 | -273/+273 |
|\ | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp | ||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 21 | -273/+273 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-31 | 4 | -0/+164 |
|\ \ | |/ | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp | ||||
| * | Add missing license headers. | Jason McDonald | 2009-08-28 | 4 | -0/+164 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Update license headers. | Jason McDonald | 2009-08-11 | 17 | -17/+17 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-13 | 17 | -17/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h | ||||
| * | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 17 | -17/+17 |
| |/ | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Aaron Kennedy | 2009-06-19 | 17 | -34/+34 |
|\ \ | |/ | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp | ||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 17 | -34/+34 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 42 | -0/+1329 |
| | |||||
* | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 2 | -0/+62 |
| | |||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 42 | -0/+1329 |