Eike Ziller 95db30bd3a Merge remote-tracking branch 'origin/4.8' ...

Conflicts:
	src/plugins/debugger/debuggeritem.cpp
	tests/unit/unittest/unittest.pro

Change-Id: Id2e4e9c2bc87b2556d7c2845aea3fe2fa11b630b

2018-10-22 09:53:54 +02:00

12 KiB

Raw Blame History

View Raw