summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-06-24 08:39:37 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-06-24 08:40:03 +0200
commit76e3f3d2a6648f3f18bb022f6ebc668d25ee525e (patch)
tree585c6e3968e13ed3367320898f9a954c51ac476c /qt.pro
parenta3dd3624f916313282855e6af53743b3edcc0249 (diff)
parent16e4fb6c98aa85e3a670b4d2d709e31c9726894b (diff)
Merge branch 'release' into stable
Conflicts: qtbase qtdeclarative qtmultimedia qtquick1 qtquickcontrols qtsensors qttools Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
Diffstat (limited to 'qt.pro')
0 files changed, 0 insertions, 0 deletions