[Orxonox-commit 859] r3369 - trunk/src/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-30 14:04:22 +0200 (Thu, 30 Jul 2009)
New Revision: 3369

Modified:
   trunk/src/core/Thread.cc
   trunk/src/core/Thread.h
   trunk/src/core/ThreadPool.cc
   trunk/src/core/ThreadPool.h
Log:
Removed the empty merge-info property from four files. When merging they would always get new merge info otherwise.


Property changes on: trunk/src/core/Thread.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/src/core/Thread.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/src/core/ThreadPool.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/src/core/ThreadPool.h
___________________________________________________________________
Deleted: svn:mergeinfo
   -