diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-30 12:28:05 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-30 12:28:05 (GMT) |
| commit | 1353abff11dd3a68884f9c6fd748dcb934383d79 (patch) | |
| tree | 0dcc25731cab6523c476cc64246151f8cf8f7c71 /.gitignore | |
| parent | 3a4f6f7884c9ea704890cd392bb5a211d2eb5701 (diff) | |
| parent | 5e3e9c5600e3089073990fd752e0eaa0336c6301 (diff) | |
| download | Qt-1353abff11dd3a68884f9c6fd748dcb934383d79.zip Qt-1353abff11dd3a68884f9c6fd748dcb934383d79.tar.gz Qt-1353abff11dd3a68884f9c6fd748dcb934383d79.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
src/network/access/qnetworkaccesshttpbackend.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions