Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
certs	…
echo	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
test	test: organize tst_qnetworkreply .pro file a bit	2013-07-15 13:49:59 +02:00
.gitattributes	…
.gitignore	…
bigfile	…
empty	…
image1.jpg	…
image2.jpg	…
image3.jpg	…
index.html	…
qnetworkreply.pro	Changed qnetworkreply unittest to work from install directory	2012-02-17 08:25:10 +01:00
qnetworkreply.qrc	…
resource	…
rfc3252.txt	…
smb-file.txt	…
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00