Merge branch 'master' into development

This commit is contained in:
DavidWyand-GG 2012-09-26 10:14:06 -04:00
commit 677377c70b
5 changed files with 1 additions and 19 deletions

1
Engine/bin/tools/comments/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
# Keep directory in git repo

View file

@ -1,9 +0,0 @@
<!DOCTYPE Comments>
<Comments>
<Project Name="Demos-Physics" >
<Comment Author="Torque 3D" Name="Mon Oct 12 15:12:23 2009" >A singleplayer demo of the integrated PhysX support in Torque 3D</Comment>
</Project>
<Project Name="Examples-FPS Example" >
<Comment Author="Torque 3D" Name="Mon Oct 12 15:13:35 2009" >An example of a multiplayer first person shooter built with the stock Torque 3D functionality</Comment>
</Project>
</Comments>

BIN
Torque 3D Toolbox.exe Normal file

Binary file not shown.

Binary file not shown.

View file

@ -1,10 +0,0 @@
<configuration>
<windows>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.VC80.CRT" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
<bindingRedirect oldVersion="8.0.41204.256-8.0.50727.4053" newVersion="8.0.50727.4053"/>
</dependentAssembly>
</assemblyBinding>
</windows>
</configuration>