Skip to content
  • Eike Ziller's avatar
    Merge remote-tracking branch 'origin/2.3' · 99ba300a
    Eike Ziller authored
    Conflicts:
    	qtcreator.pri
    	src/libs/libs.pro
    	src/plugins/debugger/watchwindow.cpp
    	src/plugins/remotelinux/maemopackagecreationstep.h
    
    Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
    99ba300a