diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-31 14:24:38 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-05-31 14:24:38 +0200 |
| commit | fb9038cdcf656da8c37d9eeab06df7c4781b5bd5 (patch) | |
| tree | 792c6f11d8112c82f09bed4d5217561745481e47 /graphics/particles/magic.hit.xml | |
| parent | d12e2c82369d874167f3ca2f5f4fc687b850da1a (diff) | |
| parent | 7741f3f564baede98efe5068286e67562a75bb60 (diff) | |
| download | clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.gz clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.bz2 clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.tar.xz clientdata-fb9038cdcf656da8c37d9eeab06df7c4781b5bd5.zip | |
Merge remote-tracking branch 'mainline/master'
Conflicts:
items.xml
Diffstat (limited to 'graphics/particles/magic.hit.xml')
| -rw-r--r-- | graphics/particles/magic.hit.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/particles/magic.hit.xml b/graphics/particles/magic.hit.xml index 427e4163..96170247 100644 --- a/graphics/particles/magic.hit.xml +++ b/graphics/particles/magic.hit.xml @@ -41,7 +41,7 @@ <property name="horizontal-angle" min="0" max="360"/> <property name="power" min="0" max="3"/> <property name="gravity" value="0.1"/> - <property name="image" value="graphics/particles/orb-medium.png#W:#000000"/> + <property name="image" value="graphics/particles/orb-medium.png|W:#000000"/> <property name="lifetime" min="0" max="80"/> <property name="output" min="40" max="60"/> <property name="fade-out" value="20"/> |