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

Timestamp:

Jan 21, 2006, 1:18:19 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network-branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6500:HEAD
minor conflicts in texture and one Makefile resolved to the trunk

also made a small patch to texture, so it Modulates with GL_REPEAT

File:

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

trunk/src/story_entities/Makefile.am

@@ -12 +12 @@
                 story_entities/multi_player_world.cc \
                 story_entities/multi_player_world_data.cc \
-                story_entities/movie_loader.cc
+                story_entities/movie_loader.cc \
+                story_entities/simple_game_menu.cc
 
 StoryEntities_HEADERS_ = \
@@ -25 +26 @@
                 story_entities/multi_player_world.h \
                 story_entities/multi_player_world_data.h \
-                story_entities/movie_loader.h
+                story_entities/movie_loader.h \
+                story_entities/simple_game_menu.h