Changeset 2710 for code/trunk/bin

Timestamp:

Feb 28, 2009, 7:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.

Location:

code/trunk

Files:

• . (modified) (2 props)
• bin/CMakeLists.txt (copied) (copied from code/branches/buildsystem3/bin/CMakeLists.txt)
• bin/Plugins.cfg (deleted)
• bin/client1.bat.in (copied) (copied from code/branches/buildsystem3/bin/client1.bat.in)
• bin/client1.in (copied) (copied from code/branches/buildsystem3/bin/client1.in)
• bin/client2.bat.in (copied) (copied from code/branches/buildsystem3/bin/client2.bat.in)
• bin/client2.in (copied) (copied from code/branches/buildsystem3/bin/client2.in)
• bin/def_keybindings.ini (deleted)
• bin/def_masterKeybindings.ini (deleted)
• bin/disco.txt (deleted)
• bin/irc.tcl (deleted)
• bin/ogre.cfg-init (deleted)
• bin/orxonox.bat (deleted)
• bin/orxonox_dev_build.keep_me (copied) (copied from code/branches/buildsystem3/bin/orxonox_dev_build.keep_me)
• bin/plugins.cfg-init (deleted)
• bin/remote.tcl (deleted)
• bin/run-script (deleted)
• bin/run.bat.in (copied) (copied from code/branches/buildsystem3/bin/run.bat.in)
• bin/run.in (copied) (copied from code/branches/buildsystem3/bin/run.in)
• bin/server.bat.in (copied) (copied from code/branches/buildsystem3/bin/server.bat.in)
• bin/server.in (copied) (copied from code/branches/buildsystem3/bin/server.in)
• bin/telnet_server.tcl (deleted)