diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:09:12 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-17 23:10:18 (GMT) |
| commit | bcec005dd1cb6eea2c2a43b681be9b56eb06fba7 (patch) | |
| tree | b426c3a515b2388c39059aa2cdc8fd409661787c /src/xmlpatterns/.gitignore | |
| parent | 08a5b8d504e86a80488a2a13525e700b6f8b3311 (diff) | |
| parent | 5e38a334b1ef46a932c8aff65a7d448b5c7df853 (diff) | |
| download | Qt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.zip Qt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.tar.gz Qt-bcec005dd1cb6eea2c2a43b681be9b56eb06fba7.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.8-from-4.7
Conflicts:
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.ui
Diffstat (limited to 'src/xmlpatterns/.gitignore')
0 files changed, 0 insertions, 0 deletions