Merged with stashed state
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:37:24 +0000 (12:37 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:37:24 +0000 (12:37 +0200)
commit30ee8320903888c51c3df90f3a1f2848d5b5e8f8
treed1d27b91c0c79ca91ddd87a78690fb7109dcc4b8
parent7e1021f8a54eb022f79c5b3eb10e578ce1d5cf5f
Merged with stashed state
trunk/src/base/backbone/Bookmarks.cpp
trunk/src/base/backbone/Bookmarks.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp