-
hjk authored
Conflicts: share/qtcreator/gdbmacros/dumper.py src/plugins/cppeditor/cpphoverhandler.cpp src/plugins/cppeditor/cpphoverhandler.h
b59fa0cd
Conflicts: share/qtcreator/gdbmacros/dumper.py src/plugins/cppeditor/cpphoverhandler.cpp src/plugins/cppeditor/cpphoverhandler.h