summaryrefslogtreecommitdiffstats
path: root/examples/painting
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-21 11:58:44 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-21 12:01:29 (GMT)
commit4aa6869877d4906fcfaac5388294748512cace25 (patch)
tree56ede34c11ec04040396dc47c843966db83b4eb2 /examples/painting
parent342e59730c512fd38a0b03888254b52f2a181ae9 (diff)
downloadQt-4aa6869877d4906fcfaac5388294748512cace25.zip
Qt-4aa6869877d4906fcfaac5388294748512cace25.tar.gz
Qt-4aa6869877d4906fcfaac5388294748512cace25.tar.bz2
Remove changes from bad merge.
This was related to e93ffdbb6fde611defc34fd27aec25c40da5a60e. Again, this most likely happened when switching between 4.5 and 4.6 and resolving some conflict incorrectly.
Diffstat (limited to 'examples/painting')
-rw-r--r--examples/painting/svgviewer/files/bubbles.svg7
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/painting/svgviewer/files/bubbles.svg b/examples/painting/svgviewer/files/bubbles.svg
index b20666e..9fae8cc 100644
--- a/examples/painting/svgviewer/files/bubbles.svg
+++ b/examples/painting/svgviewer/files/bubbles.svg
@@ -78,6 +78,10 @@
<!-- Define a shadow for each sphere. -->
<circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" />
<g id="bubble">
+ <circle fill="black" cx="0" cy="0" r="50" />
+ <circle fill="#a6ce39" cx="0" cy="0" r="33" />
+ <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10
+ L -11,22 L -1,12 Z" />
<circle cx="0" cy="0" r="100" />
</g>
</defs>
@@ -176,8 +180,6 @@
</g>
</g>
<g transform="translate(200,0)" >
-<<<<<<< HEAD:examples/painting/svgviewer/files/bubbles.svg
-=======
<g transform="translate(200,490) scale(2.0,1.0) rotate(45)" >
<rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" />
<circle fill="black" cx="0" cy="0" r="50" />
@@ -187,7 +189,6 @@
<animateTransform attributeName="transform" type="rotate" additive="sum" values="0; 360"
begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" />
</g>
->>>>>>> qt/master:examples/painting/svgviewer/files/bubbles.svg
<g transform="translate(200,375)">
<use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" />
<circle fill="url(#blueSphere)" cx="0" cy="0" r="100" />