Changeset 9406 in orxonox.OLD for trunk/src/story_entities/Makefile.am

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/story_entities/Makefile.am (modified) (2 diffs)

trunk/src/story_entities/Makefile.am

@@ -13 +13 @@
                 story_entities/multi_player_world_data.cc \
                 story_entities/movie_loader.cc \
-                story_entities/simple_game_menu.cc \
                 \
                 story_entities/menu/game_menu.cc \
@@ -30 +29 @@
                 story_entities/multi_player_world_data.h \
                 story_entities/movie_loader.h \
-                story_entities/simple_game_menu.h \
                 \
                 story_entities/menu/game_menu.h \