diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:02:59 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-01 06:02:59 (GMT) |
| commit | dc1cab966938edc5463f26189607ece134549a22 (patch) | |
| tree | ecaab6c64758f41fa9cb5b376b395831a77e6c83 /tools/designer/src/lib/shared/widgetdatabase_p.h | |
| parent | 4915439de467d1119a46af66ea08dbe161d2f336 (diff) | |
| parent | bde40a9fa852107c237ac408f93a33b5955b9290 (diff) | |
| download | Qt-dc1cab966938edc5463f26189607ece134549a22.zip Qt-dc1cab966938edc5463f26189607ece134549a22.tar.gz Qt-dc1cab966938edc5463f26189607ece134549a22.tar.bz2 | |
Merge commit 'oslo1/master' into oslo1-master
Conflicts:
doc/src/getting-started/installation.qdoc
src/gui/dialogs/qfiledialog_win.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer.cpp
Diffstat (limited to 'tools/designer/src/lib/shared/widgetdatabase_p.h')
0 files changed, 0 insertions, 0 deletions