Merge remote-tracking branch 'origin/3.5'

Browse Source

Conflicts:
	src/plugins/baremetal/gdbserverproviderssettingspage.cpp

Change-Id: I5126a4fb7db27321f835aa23e4b07ae85769ae3f

...

This commit is contained in:

Eike Ziller

2015-07-06 13:13:31 +02:00

parent e46ae661bc 29c7bcdf7e

commit 3f5b9b0291

451 changed files with 37355 additions and 1484 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

src/plugins/qmlprofiler/qml/clean_pane_small.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 677 B After Width:  |  Height:  |  Size: 584 B

BIN

src/plugins/qmlprofiler/qml/recordOff.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 496 B After Width:  |  Height:  |  Size: 406 B

BIN

src/plugins/qmlprofiler/qml/recordOn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 614 B After Width:  |  Height:  |  Size: 484 B