diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:30:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:30:42 +0200 |
| commit | eefb48c8568876527b1d85f00d34a45d62d8a6f8 (patch) | |
| tree | a941b04e3adeb3dacea53540e673861ca6095aca /src/xmlpatterns/expr/qtemplate.cpp | |
| parent | 0196fd5c23baea1691f0691e689c7a235db72e4d (diff) | |
| parent | c21924d67a8ef39282afdf3ae6fef798dfca7135 (diff) | |
| download | qtxmlpatterns-eefb48c8568876527b1d85f00d34a45d62d8a6f8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: If7c5b9674646fcd1cf8f2a6c43e4e1e0f126950f
Diffstat (limited to 'src/xmlpatterns/expr/qtemplate.cpp')
0 files changed, 0 insertions, 0 deletions