Changeset 2664 for code/branches/buildsystem3/src/orxonox/pch

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)
• src/orxonox/pch (copied) (copied from code/branches/buildsystem2/src/orxonox/pch)
• src/orxonox/pch/havepch (copied) (copied from code/branches/buildsystem2/src/orxonox/pch/havepch)
• src/orxonox/pch/havepch/OrxonoxStableHeaders.h (copied) (copied from code/branches/buildsystem2/src/orxonox/pch/havepch/OrxonoxStableHeaders.h)
• src/orxonox/pch/havepch/PrecompiledHeaderFiles.cc (copied) (copied from code/branches/buildsystem2/src/orxonox/pch/havepch/PrecompiledHeaderFiles.cc)
• src/orxonox/pch/nopch (copied) (copied from code/branches/buildsystem2/src/orxonox/pch/nopch)
• src/orxonox/pch/nopch/OrxonoxStableHeaders.h (copied) (copied from code/branches/buildsystem2/src/orxonox/pch/nopch/OrxonoxStableHeaders.h)