diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:33:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-02 12:33:03 +0100 |
| commit | 232f5f2e778c59c823e50282549eacd3af14eef7 (patch) | |
| tree | 421b4c33c127835c9a017836affb8baaea1933cc /src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp | |
| parent | f7ac18b46118d7b3cd93f812a5452028211dc8cc (diff) | |
| parent | 64dcf54e06556f951dff277feb9a9b6aa7767cf8 (diff) | |
| download | qtxmlpatterns-232f5f2e778c59c823e50282549eacd3af14eef7.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I1a3ce01707f9a09f7370479a97a8d8a738881389
Diffstat (limited to 'src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp')
0 files changed, 0 insertions, 0 deletions