diff options
| author | kh1 <qt-info@nokia.com> | 2011-05-31 12:29:13 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-05-31 12:29:13 +0200 |
| commit | c0dfe3819da318714782def16cb5c34704996a81 (patch) | |
| tree | 485e90391fbe8a35cd619637b49d9204e24a5aae /examples/testapp | |
| parent | cb77c1aefbe8e34e34ed5a3bf4093b8e41457f8e (diff) | |
| parent | 81d2f50acb25e27226bf6dbc777acb8fe2bab916 (diff) | |
Merge branch 'master' into refactor
Conflicts:
examples/testapp/componentselectiondialog.ui
Diffstat (limited to 'examples/testapp')
| -rw-r--r-- | examples/testapp/componentselectiondialog.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/testapp/componentselectiondialog.ui b/examples/testapp/componentselectiondialog.ui index 2fde9722e..74f3b3fe4 100644 --- a/examples/testapp/componentselectiondialog.ui +++ b/examples/testapp/componentselectiondialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>656</width> - <height>408</height> + <height>409</height> </rect> </property> <property name="windowTitle"> @@ -106,7 +106,7 @@ </sizepolicy> </property> <property name="text"> - <string>SelectAll</string> + <string>Select All</string> </property> </widget> </item> |