Merge branch 'cache'
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 06:16:38 +0000 (08:16 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 18 Aug 2010 06:16:38 +0000 (08:16 +0200)
commit95f8aaad24edde32849d9b6e99be47dacb19f324
tree3d4f1b388aa3b403a93e5040390b57a04ecc6bb2
parent0cc472e65e3c086a85bb8dd5f41049e162e4946a
parent4509ff7578f3348b5a712dc2b63bcc2fd847667c
Merge branch 'cache'

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