Changeset 6836 for code/branches/chat2/src/orxonox
- Timestamp:
- May 3, 2010, 1:47:54 PM (15 years ago)
- Location:
- code/branches/chat2
- Files:
-
- 2 edited
- 8 copied
-
. (modified) (1 prop)
-
src/orxonox/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/ChatHistory.cc (copied) (copied from code/branches/chat/src/orxonox/ChatHistory.cc)
-
src/orxonox/ChatHistory.h (copied) (copied from code/branches/chat/src/orxonox/ChatHistory.h)
-
src/orxonox/ChatInputHandler.cc (copied) (copied from code/branches/chat/src/orxonox/ChatInputHandler.cc)
-
src/orxonox/ChatInputHandler.h (copied) (copied from code/branches/chat/src/orxonox/ChatInputHandler.h)
-
src/orxonox/graphics/CEGuiSample.cc (copied) (copied from code/branches/chat/src/orxonox/graphics/CEGuiSample.cc)
-
src/orxonox/graphics/CEGuiSample.h (copied) (copied from code/branches/chat/src/orxonox/graphics/CEGuiSample.h)
-
src/orxonox/graphics/ChatBox.cc (copied) (copied from code/branches/chat/src/orxonox/graphics/ChatBox.cc)
-
src/orxonox/graphics/ChatBox.h (copied) (copied from code/branches/chat/src/orxonox/graphics/ChatBox.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/chat2
- Property svn:mergeinfo changed
/code/branches/chat (added) merged: 6527,6565,6577,6596-6597,6605,6633-6637,6644,6649,6652,6682,6688,6690,6693,6698-6699,6776-6777,6788,6791,6793,6797
- Property svn:mergeinfo changed
-
code/branches/chat2/src/orxonox/CMakeLists.txt
r6711 r6836 32 32 PlayerManager.cc 33 33 Radar.cc 34 ChatHistory.cc 35 ChatInputHandler.cc 34 36 COMPILATION_BEGIN SceneCompilation.cc 35 37 CameraManager.cc
Note: See TracChangeset
for help on using the changeset viewer.
