Changeset 6412 for code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.h

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/libraries/network/synchronisable/NetworkCallbackManager.h (modified) (2 diffs)

code/branches/pickup2/src/libraries/network/synchronisable/NetworkCallbackManager.h

@@ -37 +37 @@
 
 namespace orxonox{
-  
+
   class _NetworkExport NetworkCallbackManager{
     public:
@@ -48 +48 @@
       static std::queue<NetworkCallbackBase*> triggeredCallbacks_;
   };
-  
+
 
 }