Changeset 2371 for code/branches/presentation/visual_studio/vc8
- Timestamp:
- Dec 10, 2008, 12:50:05 PM (16 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- 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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/visual_studio/vc8/directories.vsprops
- Property svn:mergeinfo changed
/code/branches/network/visual_studio/vc8/directories.vsprops (added) merged: 2356
- Property svn:mergeinfo changed
-
code/branches/presentation/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/presentation/visual_studio/vc8/network.vcproj
r2087 r2371 196 196 > 197 197 </File> 198 <File199 RelativePath="..\..\src\network\Synchronisable.cc"200 >201 </File>202 198 <Filter 203 199 Name="packet" … … 229 225 <File 230 226 RelativePath="..\..\src\network\packet\Welcome.cc" 227 > 228 </File> 229 </Filter> 230 <Filter 231 Name="synchronisable" 232 > 233 <File 234 RelativePath="..\..\src\network\synchronisable\NetworkCallbackManager.cc" 235 > 236 </File> 237 <File 238 RelativePath="..\..\src\network\synchronisable\Synchronisable.cc" 239 > 240 </File> 241 <File 242 RelativePath="..\..\src\network\synchronisable\SynchronisableSpecialisations.cc" 243 > 244 </File> 245 <File 246 RelativePath="..\..\src\network\synchronisable\SynchronisableVariable.cc" 231 247 > 232 248 </File> … … 279 295 </File> 280 296 <File 281 RelativePath="..\..\src\network\NetworkCallback.h"282 >283 </File>284 <File285 297 RelativePath="..\..\src\network\NetworkPrereqs.h" 286 298 > … … 292 304 <File 293 305 RelativePath="..\..\src\network\Server.h" 294 >295 </File>296 <File297 RelativePath="..\..\src\network\Synchronisable.h"298 306 > 299 307 </File> … … 327 335 <File 328 336 RelativePath="..\..\src\network\packet\Welcome.h" 337 > 338 </File> 339 </Filter> 340 <Filter 341 Name="synchronisable" 342 > 343 <File 344 RelativePath="..\..\src\network\synchronisable\NetworkCallback.h" 345 > 346 </File> 347 <File 348 RelativePath="..\..\src\network\synchronisable\NetworkCallbackManager.h" 349 > 350 </File> 351 <File 352 RelativePath="..\..\src\network\synchronisable\Synchronisable.h" 353 > 354 </File> 355 <File 356 RelativePath="..\..\src\network\synchronisable\SynchronisableVariable.h" 329 357 > 330 358 </File> -
code/branches/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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/presentation/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.