Eike Ziller 1681066c37 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/debugger/watchdata.cpp
	src/plugins/debugger/watchdata.h
	src/shared/qbs

Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32

2016-06-09 12:07:01 +02:00

3.2 KiB

Raw Blame History

View Raw