Merge commit 'origin/future'
authorPaweł Paprota <ppawel@fastmail.fm>
Sun, 8 Jun 2008 09:48:10 +0000 (8 11:48 +0200)
committerPaweł Paprota <ppawel@fastmail.fm>
Sun, 8 Jun 2008 09:48:10 +0000 (8 11:48 +0200)
Conflicts:

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

1  2 
straw/Application.py
straw/FeedListView.py

Simple merge
@@@ -103,6 -105,6 +105,7 @@@ class TreeViewNode(object)
          return path
  
      @property
++
      def path(self):
          path = self.path_list
  
                  return None
  
      @property
++
      def parent_path(self):
          path = self.path_list
          path.pop()