Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/subprojects/Makefile.am
- Timestamp:
- Mar 18, 2005, 11:52:15 AM (20 years ago)
-
orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader
Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h
solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit
Conflits in world.cc are a MESS: fix it
- Location:
- orxonox/branches/levelloader/src/subprojects
- Files:
-
- 2 copied
-
. (copied) (copied from orxonox/trunk/src/subprojects)
-
Makefile.am (copied) (copied from orxonox/trunk/src/subprojects/Makefile.am)
Note: See TracChangeset
for help on using the changeset viewer.
