Skip to content
Find file Blame History Permalink
  • con's avatar
    Merge remote branch 'origin/2.0' · 92654942
    con authored 
    Conflicts:
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/gdbengine.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibrary.cpp
    92654942