diff options
| author | Bea Lam <bea.lam@nokia.com> | 2011-02-09 18:21:30 +1000 |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2011-02-09 18:21:30 +1000 |
| commit | 6129a16a74620916d3e8bff29a3788374ca21c94 (patch) | |
| tree | 7f9960f986e822c897c6230c4a18f6b717ed7106 /examples/qmake | |
| parent | 3ebbb660d6f0c29b438f49dc8187b1b353ee1b8a (diff) | |
| parent | 1759f7d688903210a142d7f93a6d173c52995d2f (diff) | |
| download | qt4-tools-6129a16a74620916d3e8bff29a3788374ca21c94.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
Diffstat (limited to 'examples/qmake')
0 files changed, 0 insertions, 0 deletions