Merge branch 'cache' into bookmarks
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:29:14 +0000 (12:29 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:29:14 +0000 (12:29 +0200)
commit5b4534368530b643d2bba0d187301aa9758d35cf
treed2f4e5c11f993280c98d4928baf93c69814e8306
parentf02ced5a3f50f47b53f562c94a992b20baec3a69
parent20f006e68f2f93290a4526d474d27d40d654e765
Merge branch 'cache' into bookmarks

Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp