Merge branch 'master' into bookmarks
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:20:18 +0000 (12:20 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:20:18 +0000 (12:20 +0200)
commitf02ced5a3f50f47b53f562c94a992b20baec3a69
tree52a5cc0318a51509012637ba896009a231259185
parent2a1e7556e2b86ade2532b0bd79bbeef92c865770
parent0cc472e65e3c086a85bb8dd5f41049e162e4946a
Merge branch 'master' into bookmarks
trunk/src/plugins/xdxf/src/xdxfplugin.cpp