diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-05 10:15:08 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-05 10:15:08 (GMT) |
| commit | 81a6aebbdf9319a731ee1ee368f2f05bf4bfd83c (patch) | |
| tree | f056c55bbacc1f3c0d6d516c786ebd2da27e5277 /src/corelib | |
| parent | 30cce6b9d75e25e2f4d06fb8e2571a135ec62e35 (diff) | |
| download | Qt-81a6aebbdf9319a731ee1ee368f2f05bf4bfd83c.zip Qt-81a6aebbdf9319a731ee1ee368f2f05bf4bfd83c.tar.gz Qt-81a6aebbdf9319a731ee1ee368f2f05bf4bfd83c.tar.bz2 | |
Doc: Git merge conflict in QVariantAnimation
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index dd32424..73ed0df 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -313,13 +313,6 @@ QVariantAnimation::~QVariantAnimation() The easing curve is used with the interpolator, the interpolated() virtual function, the animation's duration, and iterationCount, to control how the current value changes as the animation progresses. - -<<<<<<< Updated upstream:src/corelib/animation/qvariantanimation.cpp - The easing curve is used with the interpolator, the interpolated() virtual - function, the animation's duration, and loopCount, to control how the - current value changes as the animation progresses. -======= ->>>>>>> Stashed changes:src/corelib/animation/qvariantanimation.cpp */ QEasingCurve QVariantAnimation::easingCurve() const { |