Bill King 5e372a165f Merge branch '2.2' ...

Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h

2011-04-05 16:43:24 +02:00

83 KiB

Raw Blame History

View Raw