Skip to content
Find file Blame History Permalink
  • con's avatar
    Merge remote branch 'origin/2.0' · 38f6379f
    con authored 
    Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
    38f6379f