Merge branch 'master' into google
authorBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 13:31:03 +0000 (15:31 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Thu, 26 Aug 2010 13:31:03 +0000 (15:31 +0200)
commitc88dd54e68415f56dec8c6ec568ff72bc2a1bf8a
treee8600ca82fcecbf1918f9c67b4b0eb058a5ebc4b
parent58784c3c3001ca7f0c5d1007532ca597c8accca9
parent3d266a83fb806d69c4042852ef47cd20e8b48484
Merge branch 'master' into google
trunk/src/base/gui/SettingsWidget.cpp
trunk/src/base/gui/SettingsWidget.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp