Merge commit '1e39c712bd726e9ef426ecc316edad58d134decf' into nacl-5.6 (05389fd0) · Commits · BC / public / external / Qt / QtBase

Commit 05389fd0 authored 9 years ago by

Morten Johan Sørvig

Merge commit '1e39c712' into nacl-5.6

Conflicts:
	src/corelib/io/io.pri
	src/corelib/thread/qwaitcondition_unix.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/plugins.pro

Change-Id: If97059227ca80628b790c1655e0970d5e71cb591

parents 7f3202c3 1e39c712

wip/nacl

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1120 additions and 152 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment