Merge branch 'master' into google
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 30 Aug 2010 07:29:46 +0000 (09:29 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 30 Aug 2010 07:29:46 +0000 (09:29 +0200)
commitd70da06f6a0033acd30e1b41c4fa13034b348acd
tree0d198b7ec91d3ef456abd32e5e06efdbfd95a974
parent8d3a5b29509b80fecba8ebd4bbeb03607f8817f3
parent9c87577e5759023161c9360bdc4dab298067f1ff
Merge branch 'master' into google
trunk/src/base/backbone/backbone.cpp
trunk/src/plugins/google/src/GooglePlugin.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp