Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
authorSiddharth Srivastava <akssps011@gmail.com>
Sun, 15 Aug 2010 18:13:23 +0000 (23:43 +0530)
committerSiddharth Srivastava <akssps011@gmail.com>
Sun, 15 Aug 2010 18:13:23 +0000 (23:43 +0530)
commitbc2ec31420eafcb87dfbe9c36d75f49c819e474f
treefdb4596b7be7b8c255b0ab67b41f6cfeff3d66be
parent5f877b9042c2b9b2026cffa90f3e1e12d456d0fa
parenta445695f8edb7909961af067ff19f40e27463f0d
Merge remote branch 'mainline/svn.kde.org' into svn.kde.org
src/lib/MarbleControlBox.cpp
src/lib/MarbleModel.cpp