feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
This commit is contained in:
Eike Ziller
2013-04-23 11:13:25 +02:00
parent 48687fd8a1 c4be740bd6
commit 38b61177f6
48 changed files with 1270 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/howto/creator-ui.qdoc
View File

@@ -26,7 +26,7 @@
\contentspage index.html
\previouspage creator-overview.html
\page creator-quick-tour.html
\nextpage creator-build-example-application.html
\nextpage creator-configuring.html
\title User Interface