Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/Makefile.am

    r8751 r9006  
    2929                effects/snow_effect.cc \
    3030                effects/cloud_effect.cc \
    31                 effects/lightening_effect.cc \
     31                effects/lightning_effect.cc \
    3232                effects/lense_flare.cc
    3333
    … …  
    5858                effects/snow_effect.h \
    5959                effects/cloud_effect.h \
    60                 effects/lightening_effect.h \
     60                effects/lightning_effect.h \
    6161                effects/lense_flare.h
    6262
Note: See TracChangeset for help on using the changeset viewer.