Changeset 2664 for code/branches/buildsystem3/bin

Timestamp:

Feb 14, 2009, 10:53:45 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem2 to buildsystem3.

Note: Bare merge, just resolved conflicts. To testing, no nothing.

Location:

code/branches/buildsystem3

Files:

• . (modified) (2 props)
• bin/CMakeLists.txt (copied) (copied from code/branches/buildsystem2/bin/CMakeLists.txt)
• bin/Debug (copied) (copied from code/branches/buildsystem2/bin/Debug)
• bin/Debug/orxonox.ini (copied) (copied from code/branches/buildsystem2/bin/Debug/orxonox.ini)
• bin/Plugins.cfg (deleted)
• bin/Release (copied) (copied from code/branches/buildsystem2/bin/Release)
• bin/Release/orxonox.ini (copied) (copied from code/branches/buildsystem2/bin/Release/orxonox.ini)
• bin/ogre.cfg (copied) (copied from code/branches/buildsystem2/bin/ogre.cfg)
• bin/ogre.cfg-init (deleted)
• bin/orxonox.bat (deleted)
• bin/plugins.cfg-init (deleted)
• bin/run (copied) (copied from code/branches/buildsystem2/bin/run)
• bin/run-script (deleted)
• bin/run.bat (copied) (copied from code/branches/buildsystem2/bin/run.bat)