diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-05 05:55:15 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-05 05:55:15 (GMT) |
| commit | b6991ebab89716293ded0033fcfea98bafa5f506 (patch) | |
| tree | bd4df06c4709d7ad8b43aa0ba08047d9458e6c1c /examples/examples.pro | |
| parent | 3c937db1af251b51d1a6e2ae15a9bebb4dae9e0c (diff) | |
| parent | d8398192d50ce9e664910ebdd42b7ada5eabaacb (diff) | |
| download | Qt-b6991ebab89716293ded0033fcfea98bafa5f506.zip Qt-b6991ebab89716293ded0033fcfea98bafa5f506.tar.gz Qt-b6991ebab89716293ded0033fcfea98bafa5f506.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
tests/benchmarks/declarative/painting/paintbenchmark.cpp
Diffstat (limited to 'examples/examples.pro')
0 files changed, 0 insertions, 0 deletions