diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:43:26 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:56:14 +0200 |
| commit | 24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6 (patch) | |
| tree | 917eff8c50fe4699547b9de852ee53257c1585cf /examples/qml | |
| parent | 3e6a8eca00334df344a45f09afbcf8fd8e2b7c54 (diff) | |
| parent | ffdbf216dc80b3d781307bb6b4b7150281c874a3 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
src/quick/util/qquickimageprovider.cpp
Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c
Diffstat (limited to 'examples/qml')
0 files changed, 0 insertions, 0 deletions