Merge lp:~ajalkane/ubuntu-filemanager-app/parentPathAsPropertyAgain into lp:ubuntu-filemanager-app

[Arto Jalkanen]

parentPath as property (from upstream)

parentPath as property (from upstream)

[Arto Jalkanen (ajalkane)]

Ok for me.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-04-01 17:25:23 +0000
+++ FolderListPage.qml	2013-04-15 19:53:26 +0000
@@ -36,7 +36,7 @@
         back: Action {
             text: i18n.tr("Up")
             onTriggered: {
-                pageModel.path = pageModel.parentPath()
+                pageModel.path = pageModel.parentPath
                 console.log("Up triggered")
             }
             visible: pageModel.path != "/"
 
=== modified file 'README'
--- README	2013-03-18 21:30:47 +0000
+++ README	2013-04-15 19:53:26 +0000
@@ -5,7 +5,7 @@
 
 Currently it can be obtained like this:
 
-bzr branch lp:~ajalkane/ubuntu-filemanager-app/qml-folderlistmodel
+bzr branch lp:~carlos-mazieri/ubuntu-filemanager-app/model
 
 Running filemanager
 ===================