-
Committer:
Raphael Kubo da Costa
-
Date:
2013-06-29 16:26:49 UTC
-
mfrom:
(997.1.21)
-
Revision ID:
git-v1:816b0dbe08cfcaab96c3aeb578c331a8b783a99d
Merge branch 'KDE/4.10'
Merged with `git merge -s recursive -Xours --log --edit --no-ff'. While it
shows a lot of commits, the only actual change should come from the topmost
commit on the list.
* KDE/4.10: (21 commits)
Use pow(10, x) instead of exp10(x).
fix for previous fix :-/.
backport of fix for bug #320923
back port of the fix for bug #319115
back port of fix for bugs #318168 and #302848. I think we have it squared away.
port of fix for bug #318168 from master
fix for bug #317751
fix in new strings, there was apparently a copy/paste bug in there
Fix typo
merging minor performance patch from master
removed commented out line removed accidentlly included old version of copyright headers
there were enough changes to justify a version bump
merging changes from master into 4.10 branch
SVN_SILENT made messages (.desktop file)
fix for bug #313261
undoing the "fix" by Lukáš Tinkl (7aa28e9dfbacfb48ee3069b2e10146e2fa7a15d, unfortunately that patch undid correct behavior
OK, i think that THIS patch should fix bug #200294 (please Chris let me know if it doesn't). I set my locale to have
Fix for bug #312504
fix copy/paste error found by coverity
SVN_SILENT made messages (.desktop file)
...