con b69ab309cd Merge remote branch 'origin/2.1' ...

Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/debugger/debuggeractions.cpp

2011-02-04 11:46:30 +01:00

..

app.pro

Merge remote branch 'origin/2.1'

2011-02-04 11:46:30 +01:00

main.cpp

Move hide implementation of conditional show()

2010-11-01 19:19:32 +01:00

mainwindow.cpp

Merge remote branch 'origin/2.1'

2011-02-04 11:46:30 +01:00

mainwindow.h

Move hide implementation of conditional show()

2010-11-01 19:19:32 +01:00

mainwindow.ui

Removing ToolBar and StatusBar from mobile app ui template

2010-10-29 16:25:07 +02:00