Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks
authorBartosz Szatkowski <bulislaw@linux.com>
Tue, 17 Aug 2010 08:09:37 +0000 (10:09 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Tue, 17 Aug 2010 08:09:37 +0000 (10:09 +0200)
1  2 
trunk/src/base/backbone/Bookmarks.cpp

Simple merge