From: Paweł Paprota <ppawel@fastmail.fm>
Date: Sun, 8 Jun 2008 09:48:10 +0000 (+0200)
Subject: Merge commit 'origin/future'
X-Git-Url: https://repo.or.cz/w/straw.git/commitdiff_plain/b1665e90626b3367d856b8994f0693b262cf8492

Merge commit 'origin/future'

Conflicts:

	straw/Application.py
	straw/FeedListView.py
	straw/FeedManager.py
	straw/ItemList.py
	straw/helpers.py
	straw/model/__init__.py
---

b1665e90626b3367d856b8994f0693b262cf8492
diff --cc straw/FeedListView.py
index 5d7d81e,f198b47..4367168
--- a/straw/FeedListView.py
+++ b/straw/FeedListView.py
@@@ -103,6 -105,6 +105,7 @@@ class TreeViewNode(object)
          return path
  
      @property
++
      def path(self):
          path = self.path_list
  
@@@ -124,6 -126,6 +127,7 @@@
                  return None
  
      @property
++
      def parent_path(self):
          path = self.path_list
          path.pop()