summaryrefslogtreecommitdiffstats
path: root/demos/textedit
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-293-6/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-163-6/+6
| | | | | | | | Reviewed-by: Trust Me
| * Long live Qt 4.5!Lars Knoll2009-03-2346-0/+1033
|
* Long live Qt for S60!axis2009-04-2446-0/+1041