diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-01 14:49:13 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-09-01 14:49:13 (GMT) |
| commit | 93906071c31a5008625e727dad530a6f05441baa (patch) | |
| tree | 8fc8dbc5b0bdb17a97d4c4909889c0aa9bcc0aaa /tools | |
| parent | e48ad5a89deb5e73c28e689665dfdb71268be8e0 (diff) | |
| parent | efc616f2a1a83bd4ca50aea9d40a0df005ada063 (diff) | |
| download | Qt-93906071c31a5008625e727dad530a6f05441baa.zip Qt-93906071c31a5008625e727dad530a6f05441baa.tar.gz Qt-93906071c31a5008625e727dad530a6f05441baa.tar.bz2 | |
Merge commit 'qt/4.6' into kinetic-declarativeui
Conflicts:
tools/qdoc3/test/classic.css
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/classic.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css index b02edec..c0bc3d47 100644 --- a/tools/qdoc3/test/classic.css +++ b/tools/qdoc3/test/classic.css @@ -254,7 +254,6 @@ span.string,span.char } .qmltype { - // font-weight: bold; text-align: center; font-size: 160%; } |