diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
| commit | 1898c46452beae9e28cf9be7851099b4b4d2779e (patch) | |
| tree | 00477e689bf1bd867fb3428476029b47817a9db8 /src/3rdparty/webkit/ChangeLog | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 4d5a5149b716c67f031a3a40e23370f90542c92f (diff) | |
| download | Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.zip Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.gz Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/3rdparty/webkit/ChangeLog')
| -rw-r--r-- | src/3rdparty/webkit/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index ec8242d..76cfc80 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,11 @@ +2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Ariya Hidayat. + + Added support for generating API docs in the Qt build using "make docs" + + * WebKit.pro: Include docs.pri for "make docs" target. + 2008-12-19 Marco Barisione <marco.barisione@collabora.co.uk> Reviewed by Holger Freyther. |