diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-05-26 00:38:06 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-05-26 00:38:06 (GMT) |
| commit | 3d34201d34ba26530025d5ff88fa6e498ae6f800 (patch) | |
| tree | 490263b773db802c4dcf9355ef789e3e19c9cf0f /examples/declarative/toys/README | |
| parent | 96f47aeec086b2d35b859194e42721dbc2d2db6a (diff) | |
| parent | 291dce4ceba88a6cada0415524e3466621ac1612 (diff) | |
| download | Qt-3d34201d34ba26530025d5ff88fa6e498ae6f800.zip Qt-3d34201d34ba26530025d5ff88fa6e498ae6f800.tar.gz Qt-3d34201d34ba26530025d5ff88fa6e498ae6f800.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
Diffstat (limited to 'examples/declarative/toys/README')
| -rw-r--r-- | examples/declarative/toys/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/toys/README b/examples/declarative/toys/README index 7fd7eb0..ff4d024 100644 --- a/examples/declarative/toys/README +++ b/examples/declarative/toys/README @@ -1,4 +1,4 @@ -These pure QML examples create complete components to demonstrate +These pure QML examples demonstrate some of what can be easily done using just a few QML files. The example launcher provided with Qt can be used to explore each of the |