Merge remote-tracking branch 'origin/2.5'

Browse Source

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qtsupport/gettingstartedwelcomepage.cpp

Change-Id: I9157b9b9c05564ddeb3c72cec6b59523b8165d76

...

This commit is contained in:

Oswald Buddenhagen

2012-03-22 15:09:50 +01:00

parent e01e899733 b9dfbd8ec3

commit dbcaadd8af

27 changed files with 248 additions and 141 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/coreplugin/images/splitbutton_closebottom.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 216 B After Width:  |  Height:  |  Size: 286 B

BIN

src/plugins/coreplugin/images/splitbutton_closeleft.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 288 B

BIN

src/plugins/coreplugin/images/splitbutton_closeright.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 238 B After Width:  |  Height:  |  Size: 283 B

BIN

src/plugins/coreplugin/images/splitbutton_closetop.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 210 B After Width:  |  Height:  |  Size: 272 B

BIN

src/plugins/coreplugin/images/splitbutton_horizontal.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 238 B