Last change
on this file since 4159 was
3605,
checked in by bensch, 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
|
File size:
37 bytes
|
Line | |
---|
1 | int main(int argc, char** argv) |
---|
2 | { |
---|
3 | |
---|
4 | } |
---|
Note: See
TracBrowser
for help on using the repository browser.