Eike Ziller 74cdce071f Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75

2016-02-24 10:08:37 +01:00

..

test.py

Merge remote-tracking branch 'origin/3.6'

2016-02-24 10:08:37 +01:00