aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/proxysettings.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qtquick2'Martin Jones2011-05-311-18/+18
|\
| * QmlViewer: Translate UIKai Koehne2011-05-101-18/+18
* | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-241-17/+17
|/
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+113