Eike Ziller d8fd5292f1 Merge remote-tracking branch 'origin/4.4' ...

Conflicts:
	src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.h

Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75

2017-08-15 10:07:51 +02:00

52 KiB

Raw Blame History

View Raw