diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 23:07:37 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 23:07:37 +0200 |
| commit | 23eb677daea8e084fcaa1256f1a9433e324b1474 (patch) | |
| tree | a21225293db6881174814290ad7298120c4a078b /src/declarative/qml/parser/qdeclarativejslexer.cpp | |
| parent | 1f327a1de8db245d0b28e7dfdc5bca1af0b56782 (diff) | |
| parent | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (diff) | |
| download | qt4-tools-23eb677daea8e084fcaa1256f1a9433e324b1474.tar.gz | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
examples/declarative/proxywidgets/proxywidgets.pro
examples/declarative/widgets/mywidgets.pro
examples/declarative/widgets/widgets.pro
Diffstat (limited to 'src/declarative/qml/parser/qdeclarativejslexer.cpp')
0 files changed, 0 insertions, 0 deletions