Skip to content
Find file Blame History Permalink
  • hjk's avatar
    Merge remote branch 'origin/2.0' · b59fa0cd
    hjk authored 
    Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h
    b59fa0cd