con 2ca77dfe1e Merge remote branch 'origin/2.1' ...

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp

2011-03-02 11:49:52 +01:00

..

debian

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00

BatteryIndicator.desktop

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00

BatteryIndicator.png

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00

BatteryIndicator.pro

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00

BatteryIndicator.svg

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00

deployment.pri

Maemo: Change installation prefix for non-Fremantle systems.

2010-12-01 16:56:51 +01:00

main.cpp

Add copyright headers to c++ files in doc/

2011-02-24 10:27:00 +01:00

mainwindow.cpp

Add copyright headers to c++ files in doc/

2011-02-24 10:27:00 +01:00

mainwindow.h

Merge remote branch 'origin/2.1'

2011-03-02 11:49:52 +01:00

mainwindow.ui

Doc - update Battery Indicator example

2010-10-08 16:27:19 +02:00