summaryrefslogtreecommitdiffstats
path: root/examples/declarative/declarative.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-03-14 10:40:58 (GMT)
committeraxis <qt-info@nokia.com>2011-03-14 10:40:58 (GMT)
commitd8aa0f54f8e6f5d2a95965203b7f60c11297dacf (patch)
tree27421db20ab68dff072f0d9a7735742d20855993 /examples/declarative/declarative.pro
parent8f59ff17926e246ff732ce40890a3a7625b8e826 (diff)
parentd45c67d01ce28f4fb85eace1116ca751a8f02827 (diff)
downloadQt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.zip
Qt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.gz
Qt-d8aa0f54f8e6f5d2a95965203b7f60c11297dacf.tar.bz2
Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7
Conflicts: mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'examples/declarative/declarative.pro')
0 files changed, 0 insertions, 0 deletions