Changeset 2531 for code/branches/bugger/visual_studio/vc8
- Timestamp:
- Dec 23, 2008, 11:09:55 PM (16 years ago)
- Location:
- code/branches/bugger
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/bugger
- Property svn:mergeinfo changed
/code/branches/network (added) merged: 2356 /code/branches/network64 (added) merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/audio.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/audio.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/base.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/base.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/ceguilua.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/ceguilua.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/core.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/core.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/cpptcl.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/cpptcl.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/debug.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/debug.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/lua.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/lua.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/network.vcproj
r2087 r2531 197 197 </File> 198 198 <File 199 RelativePath="..\..\src\network\ Synchronisable.cc"199 RelativePath="..\..\src\network\TrafficControl.cc" 200 200 > 201 201 </File> … … 229 229 <File 230 230 RelativePath="..\..\src\network\packet\Welcome.cc" 231 > 232 </File> 233 </Filter> 234 <Filter 235 Name="synchronisable" 236 > 237 <File 238 RelativePath="..\..\src\network\synchronisable\NetworkCallbackManager.cc" 239 > 240 </File> 241 <File 242 RelativePath="..\..\src\network\synchronisable\Synchronisable.cc" 243 > 244 </File> 245 <File 246 RelativePath="..\..\src\network\synchronisable\SynchronisableSpecialisations.cc" 247 > 248 </File> 249 <File 250 RelativePath="..\..\src\network\synchronisable\SynchronisableVariable.cc" 231 251 > 232 252 </File> … … 279 299 </File> 280 300 <File 281 RelativePath="..\..\src\network\NetworkCallback.h"282 >283 </File>284 <File285 301 RelativePath="..\..\src\network\NetworkPrereqs.h" 286 302 > … … 292 308 <File 293 309 RelativePath="..\..\src\network\Server.h" 294 >295 </File>296 <File297 RelativePath="..\..\src\network\Synchronisable.h"298 310 > 299 311 </File> … … 327 339 <File 328 340 RelativePath="..\..\src\network\packet\Welcome.h" 341 > 342 </File> 343 </Filter> 344 <Filter 345 Name="synchronisable" 346 > 347 <File 348 RelativePath="..\..\src\network\synchronisable\NetworkCallback.h" 349 > 350 </File> 351 <File 352 RelativePath="..\..\src\network\synchronisable\NetworkCallbackManager.h" 353 > 354 </File> 355 <File 356 RelativePath="..\..\src\network\synchronisable\Synchronisable.h" 357 > 358 </File> 359 <File 360 RelativePath="..\..\src\network\synchronisable\SynchronisableVariable.h" 329 361 > 330 362 </File> -
code/branches/bugger/visual_studio/vc8/network.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/network.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/orxonox.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/orxonox_vc8.sln
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/orxonox_vc8.sln (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/release.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/release.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/tinyxml.vcproj
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/tinyxml.vcproj (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/tinyxml.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/tinyxml.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/tolua.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/tolua.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/toluagen.vcproj
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/toluagen.vcproj (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/toluagen.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/toluagen.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vcproj
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/toluagen_orxonox.vcproj (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/toluagen_orxonox.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/toluagen_orxonox.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/bugger/visual_studio/vc8/util.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/util.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.