• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.7' · 9ff8979d
    Eike Ziller authored
    Conflicts:
    	src/plugins/cpptools/cppchecksymbols.h
    	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp
    
    Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
    9ff8979d
androidconfigurations.h 4.81 KB