Changeset 9006 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Jul 2, 2006, 2:11:59 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the mountain_lake branche back to the trunk
merged with command:
svn merge -r8799:HEAD ​https://svn.orxonox.net/orxonox/branches/mountain_lake .

conflicts in script taken from the branche, since they are indentation-problems.

also fixed the delete-bug for the lightning-effect

File:

• trunk/src/Makefile.am (modified) (1 diff)

trunk/src/Makefile.am

@@ -46 +46 @@
                 lib/graphics/effects/snow_effect.cc \
                 lib/graphics/effects/cloud_effect.cc \
-                lib/graphics/effects/lightening_effect.cc \
+                lib/graphics/effects/lightning_effect.cc \
                 lib/graphics/effects/lense_flare.cc \
                 \