Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:42 +0000 (14:11 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:42 +0000 (14:11 +0100)
commit047191f1d23b27cf68e8f0db24ff918fb465b70b
tree98a576a36a42c85b840202ab5776f71588ad8264
parenta0723d9bf7fca719db2249178e1e066d94e9c2c1
parent07d8ce32b1112dcb590c793ee51cb713e514011b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7
examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp