Merge remote branch 'origin/2.1'
Conflicts: share/qtcreator/templates/mobileapp/app.pro share/qtcreator/templates/qmlapp/app.pro src/plugins/cpptools/cpptools.pro
Showing

36.9 KB
9.04 KB


32.7 KB


This diff is collapsed.
Conflicts: share/qtcreator/templates/mobileapp/app.pro share/qtcreator/templates/qmlapp/app.pro src/plugins/cpptools/cpptools.pro
92.8 KB | W: | H:
119 KB | W: | H:
36.9 KB
9.04 KB
46.3 KB | W: | H:
17.6 KB | W: | H:
7.04 KB | W: | H:
22 KB | W: | H:
32.7 KB
61.6 KB | W: | H:
84.1 KB | W: | H:
39.3 KB | W: | H:
76.1 KB | W: | H: