src/plugins/valgrind/memcheckerrorview.cpp · 3ba3f335e37828fbc24e80f148b89c5fde30d5cc · Marco Bubke / flatpak-qt-creator

You need to sign in or sign up before continuing.

13 years ago

Merge remote-tracking branch 'origin/2.3' · e5ca4b34

Eike Ziller authored 13 years ago

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300

e5ca4b34

History

Merge remote-tracking branch 'origin/2.3'

Eike Ziller authored 13 years ago

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300