Changeset 2211 for code/branches/network64/src/network/synchronisable
- Timestamp:
- Nov 14, 2008, 4:13:06 PM (16 years ago)
- Location:
- code/branches/network64/src/network/synchronisable
- Files:
-
- 2 added
- 3 moved
-
. (added)
-
CMakeLists.txt (added)
-
NetworkCallback.h (moved) (moved from code/branches/network64/src/network/NetworkCallback.h) (1 diff, 1 prop)
-
Synchronisable.cc (moved) (moved from code/branches/network64/src/network/Synchronisable.cc) (1 diff, 1 prop)
-
Synchronisable.h (moved) (moved from code/branches/network64/src/network/Synchronisable.h) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network64/src/network/synchronisable/NetworkCallback.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/NetworkCallback.h merged eligible /code/branches/objecthierarchy/src/network/NetworkCallback.h merged eligible /code/branches/pickups/src/network/NetworkCallback.h merged eligible /code/branches/questsystem/src/network/NetworkCallback.h merged eligible /code/branches/weapon/src/network/NetworkCallback.h merged eligible /code/branches/core3/src/network/NetworkCallback.h 1572-1739 /code/branches/gcc43/src/network/NetworkCallback.h 1580 /code/branches/gui/src/network/NetworkCallback.h 1635-1723 /code/branches/input/src/network/NetworkCallback.h 1629-1636 /code/branches/script_trigger/src/network/NetworkCallback.h 1295-1953,1955
r2210 r2211 2 2 #define _NETWORK_CALLBACK__ 3 3 4 #include " NetworkPrereqs.h"4 #include "network/NetworkPrereqs.h" 5 5 6 6 namespace orxonox{ -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/network64/src/network/synchronisable/Synchronisable.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/Synchronisable.cc merged eligible /code/branches/objecthierarchy/src/network/Synchronisable.cc merged eligible /code/branches/pickups/src/network/Synchronisable.cc merged eligible /code/branches/questsystem/src/network/Synchronisable.cc merged eligible /code/branches/script_trigger/src/network/Synchronisable.cc merged eligible /code/branches/weapon/src/network/Synchronisable.cc merged eligible /code/branches/core3/src/network/Synchronisable.cc 1572-1739 /code/branches/gcc43/src/network/Synchronisable.cc 1580 /code/branches/gui/src/network/Synchronisable.cc 1635-1723 /code/branches/input/src/network/Synchronisable.cc 1629-1636
r2210 r2211 50 50 // #include "core/Identifier.h" 51 51 52 #include " Host.h"52 #include "network/Host.h" 53 53 namespace orxonox 54 54 { -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/branches/network64/src/network/synchronisable/Synchronisable.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/ceguilua/src/network/Synchronisable.h merged eligible /code/branches/objecthierarchy/src/network/Synchronisable.h merged eligible /code/branches/pickups/src/network/Synchronisable.h merged eligible /code/branches/questsystem/src/network/Synchronisable.h merged eligible /code/branches/script_trigger/src/network/Synchronisable.h merged eligible /code/branches/weapon/src/network/Synchronisable.h merged eligible /code/branches/core3/src/network/Synchronisable.h 1572-1739 /code/branches/gcc43/src/network/Synchronisable.h 1580 /code/branches/gui/src/network/Synchronisable.h 1635-1723 /code/branches/input/src/network/Synchronisable.h 1629-1636
r2210 r2211 30 30 #define _Synchronisable_H__ 31 31 32 #include " NetworkPrereqs.h"32 #include "network/NetworkPrereqs.h" 33 33 34 34 #include <list> -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.
