Merge branch 'master' into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 18 Aug 2010 09:45:34 +0000 (11:45 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 18 Aug 2010 09:45:34 +0000 (11:45 +0200)
commited7d3c16eea29c0a476846c1fd16d5ac3aa8c0bc
treec341b63270315437f425c51ae8dd1a459b9ff42b
parentfb39a9f80f4105a2dea8b265138d897997ccb74a
parent190e1b71f08ae1e864eda3cded51c7be75ab256d
Merge branch 'master' into cache
trunk/src/plugins/xdxf/src/xdxfplugin.cpp