Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 1 Sep 2010 13:49:30 +0000 (15:49 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 1 Sep 2010 13:49:30 +0000 (15:49 +0200)
commitbac230baa1763963c76ff7837ade2271a78f8942
treee2a71e375f6137b2ca90ccbb43f0c9e0c610dbec
parenta99e4e4093b3e218f89cd0c531ac340b781e14e0
parentb42fc3c50a399635338248f5e282b09142bbd97b
Merge branch 'master' into google
trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
trunk/src/plugins/xdxf/src/xdxfplugin.cpp