lp:~kubuntu-members/kcalc/4.11
- Get this branch:
- bzr branch lp:~kubuntu-members/kcalc/4.11
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kcalc,branch=KDE%2F4.11.
Last successful import was .
Recent revisions
- 1033. By Nico Kruber <email address hidden>
-
fix compilation on MSVC (at least 2010)
from http://
commits. kde.org/ emerge/ 5374bda2761be3b 3b702d85210faa9 c4f402be8f - 1031. By Raphael Kubo da Costa <email address hidden>
-
Use math.h instead of cmath.
Also known as "let's try to prevent the #ifdef madness before it grows too
wild".`isinf' and `isnan' are macros in C99, are not mentioned in C++03 and are
regular functions in C++11 (some C++ standard libraries such as GNU's
libstdc++ do implement those functions in C++98 and C++03 mode).Simplify the current checks by unconditionally using math.h instead: this
allows us not to care about whether the `std' namespace is required and
assumes both `isinf' and `isnan' are macros, which are implemented when
undefined.CCBUG: 320803
REVIEW: 111509 - 1029. By Raphael Kubo da Costa <email address hidden>
-
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 (7aa28e9dfbacfb48ee3069b2e1014 6e2fa7a15d, 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)
... - 1027. By Evan Teran
-
fix for previous fix :-/.
Basically, Things like NaN ^ Inf should equal NaN, not +Inf
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)