Changeset 1862
- Timestamp:
- 11/04/09 15:53:26 (2 months ago)
- Location:
- branches/ogre_1.7_update
- Files:
-
- 170 modified
- 37 copied
-
. (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7 (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/License.txt (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll.config (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.xml (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll.config (modified) (view diffs)
-
Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.xml (modified) (view diffs)
-
Media/DeferredShadingMedia (modified) (view diffs)
-
Media/DeferredShadingMedia/COPYING (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred.glsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred.hlsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred.material (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_debug.glsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_debug.hlsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_debug.material (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_minilight.glsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_minilight.hlsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_minilight.material (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_multipass.glsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_multipass.hlsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_multipass.material (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_onepass.glsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_onepass.hlsl.program (modified) (view diffs)
-
Media/DeferredShadingMedia/deferred_post_onepass.material (modified) (view diffs)
-
Media/DeferredShadingMedia/deferreddemo.material (modified) (view diffs)
-
Media/Materials/Examples.material (modified) (view diffs)
-
Media/PCZAppMedia (modified) (view diffs)
-
Media/PCZAppMedia/Carpet_Diamond_Olive.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Brass_Ceiling.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Embossed.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Rusted.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Rusted1.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Steel_Textured.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Metal_Steel_Textured_White.jpg (modified) (view diffs)
-
Media/PCZAppMedia/ROOM.material (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_NX.mesh (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_NY.mesh (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_NZ.mesh (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_PX.mesh (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_PY.mesh (modified) (view diffs)
-
Media/PCZAppMedia/ROOM_PZ.mesh (modified) (view diffs)
-
Media/PCZAppMedia/Roofing_Tile_Spanish.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Translucent_Glass_Tinted.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Translucent_Glass_Tinted1.jpg (modified) (view diffs)
-
Media/PCZAppMedia/Wood_Floor.jpg (modified) (view diffs)
-
Media/PCZAppMedia/building_exterior.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxnynz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpx.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpxnypynzpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpxnz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpxnzpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpxpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpynz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nxpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nypy.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nypy_4y.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_nzpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_pxnynz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_pxpynz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/room_pxpz.mesh (modified) (view diffs)
-
Media/PCZAppMedia/terrain.png (modified) (view diffs)
-
Media/PCZAppMedia/terrain2.cfg (modified) (view diffs)
-
Media/PCZAppMedia/terrain2.png (modified) (view diffs)
-
Projects/Axiom.2008.sln (modified) (view diffs)
-
Projects/Axiom/Engine/Core/BillboardChain.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Core/ResourceManager.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Core/SceneManager.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Core/SceneNode.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Core/Texture.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Graphics/AutoParamDataSource.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Graphics/GpuProgramParameters.AutoConstants.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Graphics/GpuProgramParameters.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Graphics/RenderSystem.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/Elements/BorderPanel.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/Elements/Panel.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/Elements/TextArea.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/OverlayElement.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/OverlayElementContainer.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Overlays/OverlayManager.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Scripting/CommandAttribute.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Scripting/IPropertyCommand.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Scripting/ScriptEnumAttribute.cs (modified) (view diffs)
-
Projects/Axiom/Engine/Scripting/ScriptableObject.cs (modified) (view diffs)
-
Projects/Axiom/Platforms/Win32/Win32InputReader.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/DevILCodecs (modified) (view diffs)
-
Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.2010.csproj (modified) (view diffs)
-
Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.csproj (modified) (view diffs)
-
Projects/Axiom/Plugins/DevILCodecs/Diagrams (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/ClassDiagram1.cd (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/ConfigFile.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/HeightmapTerrainZonePageSource.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/Octree.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/OctreeZone.2010.csproj (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/OctreeZone.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/OctreeZone.csproj (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/OctreeZonePlugin.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/Properties (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/Properties/AssemblyInfo.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainVertexProgram.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainZone.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainZoneOptions.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainZonePage.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSource.cs (modified) (view diffs)
-
Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSourceOptionList.cs (modified) (view diffs)
-
Projects/Axiom/RenderSystems/DirectX9/D3DRenderSystem.cs (modified) (view diffs)
-
Projects/Axiom/RenderSystems/OpenGL/GLRenderSystem.cs (modified) (view diffs)
-
Projects/Axiom/RenderSystems/XNA/Source/XnaRenderSystem.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.2010.csproj (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.csproj (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Capsule.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/DefaultZone.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/MovableObjectFactory.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCPlane.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZCamera.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZFrustum.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZLight.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZPPlugin.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZSceneManager.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZSceneNode.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZSceneQuery.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZone.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/PCZoneFactory.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Portal.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Properties (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Properties/AssemblyInfo.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/Segment.cs (modified) (view diffs)
-
Projects/Axiom/SceneManagers/PCZ/VisibleObjectsBoundsInfo.cs (modified) (view diffs)
-
Projects/AxiomDemos/Source/Demos/Axiom.Demos.csproj (modified) (view diffs)
-
Projects/Tests (copied) (copied from trunk/Projects/Tests) (view diffs)
-
Projects/Tests/Axiom.Tests (copied) (copied from trunk/Projects/Tests/Axiom.Tests) (view diffs)
-
Projects/Tests/Axiom.Tests/Axiom.Tests.csproj (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Axiom.Tests.csproj) (view diffs)
-
Projects/Tests/Axiom.Tests/Collections (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Collections) (view diffs)
-
Projects/Tests/Axiom.Tests/Collections/NamedCollectionRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Collections/NamedCollectionRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/ChainedEventTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/ChainedEventTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/LodStrategyTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/LodStrategyTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/ResourceGroupManager.ManualResourceCreation.Test.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/ResourceGroupManager.ManualResourceCreation.Test.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/SceneManagerRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/SceneManagerRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/SceneNodeRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/SceneNodeRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Core/SceneNodeTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Core/SceneNodeTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/EngineConfig.xml (copied) (copied from trunk/Projects/Tests/Axiom.Tests/EngineConfig.xml) (view diffs)
-
Projects/Tests/Axiom.Tests/Fonts (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Fonts) (view diffs)
-
Projects/Tests/Axiom.Tests/Fonts/FontManagerRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Fonts/FontManagerRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Graphics (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Graphics) (view diffs)
-
Projects/Tests/Axiom.Tests/Graphics/GpuProgramParametersTestFixture.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Graphics/GpuProgramParametersTestFixture.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Math (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Math) (view diffs)
-
Projects/Tests/Axiom.Tests/Math/AxisAlignedBoxTest.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Math/AxisAlignedBoxTest.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Properties (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Properties) (view diffs)
-
Projects/Tests/Axiom.Tests/Properties/AssemblyInfo.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Properties/AssemblyInfo.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Bsp (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Bsp) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneManagerRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneManagerRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneNodeRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneNodeRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneNodeTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Bsp/BspSceneNodeTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Octree (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Octree) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeNodeRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeNodeRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeNodeTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeNodeTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeSceneManagerRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/Octree/OctreeSceneManagerRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneManagerRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneManagerRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneNodeRegressionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneNodeRegressionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneNodeTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/SceneManagers/PortalConnected/PCZSceneNodeTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Serialization (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Serialization) (view diffs)
-
Projects/Tests/Axiom.Tests/Serialization/BitConverterExtensionTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Serialization/BitConverterExtensionTests.cs) (view diffs)
-
Projects/Tests/Axiom.Tests/Serialization/StreamSerializerTests.cs (copied) (copied from trunk/Projects/Tests/Axiom.Tests/Serialization/StreamSerializerTests.cs) (view diffs)
-
branches/ogre_1.7_update
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow:1012-1662 2 /trunk:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK:1012-1662* 2 /trunk/Lib/Managed/XPlatform/OpenTK:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7:1012-1662* 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/License.txt
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/License.txt:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/License.txt:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll.config
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll.config:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.dll.config:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.xml
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.xml:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.Utilities.xml:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll.config
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll.config:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.dll.config:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.xml
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.xml:1012-1662 2 /trunk/Lib/Managed/XPlatform/OpenTK/0.9.7/OpenTK.xml:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia:1012-1662* 2 /trunk/Media/DeferredShadingMedia:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/COPYING
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/COPYING:1012-1662 2 /trunk/Media/DeferredShadingMedia/COPYING:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_notex_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/nm_vs.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/notex_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/glsl/vs.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_notex_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/nm_vs.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/notex_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/material/hlsl/vs.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/Ambient_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/GlobalLight_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/LightMaterial_vs.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowColour_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowDS_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/ShowNormal_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/SinglePass_ps.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/glsl/vs.glsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl:1012-1662* 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/Ambient_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/GlobalLight_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/LightMaterial_vs.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowColour_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowDS_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/ShowNormal_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/SinglePass_ps.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl:1012-1662 2 /trunk/Media/DeferredShadingMedia/DeferredShading/post/hlsl/vs.hlsl:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred.glsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred.glsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred.glsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred.hlsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred.hlsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred.hlsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_debug.glsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_debug.glsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_debug.glsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_debug.hlsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_debug.hlsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_debug.hlsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_debug.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_debug.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_debug.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_minilight.glsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_minilight.glsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_minilight.glsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_minilight.hlsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_minilight.hlsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_minilight.hlsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_minilight.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_minilight.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_minilight.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_multipass.glsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_multipass.glsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_multipass.glsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_multipass.hlsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_multipass.hlsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_multipass.hlsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_multipass.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_multipass.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_multipass.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_onepass.glsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_onepass.glsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_onepass.glsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_onepass.hlsl.program
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_onepass.hlsl.program:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_onepass.hlsl.program:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferred_post_onepass.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferred_post_onepass.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferred_post_onepass.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/DeferredShadingMedia/deferreddemo.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/DeferredShadingMedia/deferreddemo.material:1012-1662 2 /trunk/Media/DeferredShadingMedia/deferreddemo.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia:1012-1662* 2 /trunk/Media/PCZAppMedia:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Carpet_Diamond_Olive.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Carpet_Diamond_Olive.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Carpet_Diamond_Olive.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Brass_Ceiling.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Brass_Ceiling.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Brass_Ceiling.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Embossed.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Embossed.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Embossed.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Rusted.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Rusted.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Rusted.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Rusted1.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Rusted1.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Rusted1.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Steel_Textured.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Steel_Textured.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Steel_Textured.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Metal_Steel_Textured_White.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Metal_Steel_Textured_White.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Metal_Steel_Textured_White.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM.material
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM.material:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM.material:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_NX.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_NX.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_NX.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_NY.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_NY.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_NY.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_NZ.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_NZ.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_NZ.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_PX.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_PX.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_PX.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_PY.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_PY.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_PY.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/ROOM_PZ.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/ROOM_PZ.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/ROOM_PZ.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Roofing_Tile_Spanish.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Roofing_Tile_Spanish.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Roofing_Tile_Spanish.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Translucent_Glass_Tinted.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Translucent_Glass_Tinted.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Translucent_Glass_Tinted.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Translucent_Glass_Tinted1.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Translucent_Glass_Tinted1.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Translucent_Glass_Tinted1.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/Wood_Floor.jpg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/Wood_Floor.jpg:1012-1662 2 /trunk/Media/PCZAppMedia/Wood_Floor.jpg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/building_exterior.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/building_exterior.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/building_exterior.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxnynz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxnynz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxnynz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpx.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpx.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpx.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpxnypynzpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpxnypynzpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpxnypynzpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpxnz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpxnz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpxnz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpxnzpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpxnzpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpxnzpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpxpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpxpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpxpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpynz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpynz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpynz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nxpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nxpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nxpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nypy.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nypy.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nypy.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nypy_4y.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nypy_4y.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nypy_4y.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_nzpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_nzpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_nzpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_pxnynz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_pxnynz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_pxnynz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_pxpynz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_pxpynz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_pxpynz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/room_pxpz.mesh
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/room_pxpz.mesh:1012-1662 2 /trunk/Media/PCZAppMedia/room_pxpz.mesh:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/terrain.png
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/terrain.png:1012-1662 2 /trunk/Media/PCZAppMedia/terrain.png:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/terrain2.cfg
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/terrain2.cfg:1012-1662 2 /trunk/Media/PCZAppMedia/terrain2.cfg:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Media/PCZAppMedia/terrain2.png
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Media/PCZAppMedia/terrain2.png:1012-1662 2 /trunk/Media/PCZAppMedia/terrain2.png:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/DevILCodecs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/DevILCodecs:1012-1662* 2 /trunk/Projects/Axiom/Plugins/DevILCodecs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.2010.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.2010.csproj:1012-1662 2 /trunk/Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.2010.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.csproj:1012-1662 2 /trunk/Projects/Axiom/Plugins/DevILCodecs/Axiom.Plugins.DevILCodecs.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/DevILCodecs/Diagrams
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/DevILCodecs/Diagrams:1012-1662* 2 /trunk/Projects/Axiom/Plugins/DevILCodecs/Diagrams:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone:1012-1662* 2 /trunk/Projects/Axiom/Plugins/OctreeZone:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/ClassDiagram1.cd
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/ClassDiagram1.cd:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/ClassDiagram1.cd:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/ConfigFile.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/ConfigFile.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/ConfigFile.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/HeightmapTerrainZonePageSource.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/HeightmapTerrainZonePageSource.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/HeightmapTerrainZonePageSource.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/Octree.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/Octree.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/Octree.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/OctreeZone.2010.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/OctreeZone.2010.csproj:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/OctreeZone.2010.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/OctreeZone.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/OctreeZone.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/OctreeZone.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/OctreeZone.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/OctreeZone.csproj:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/OctreeZone.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/OctreeZonePlugin.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/OctreeZonePlugin.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/OctreeZonePlugin.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/Properties
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/Properties:1012-1662* 2 /trunk/Projects/Axiom/Plugins/OctreeZone/Properties:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/Properties/AssemblyInfo.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/Properties/AssemblyInfo.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/Properties/AssemblyInfo.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainVertexProgram.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainVertexProgram.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainVertexProgram.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZone.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZone.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZone.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZoneOptions.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZoneOptions.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZoneOptions.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZonePage.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZonePage.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZonePage.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSource.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZonePageSource.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSource.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSourceOptionList.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/Plugins/OctreeZone/TerrainZonePageSourceOptionList.cs:1012-1662 2 /trunk/Projects/Axiom/Plugins/OctreeZone/TerrainZonePageSourceOptionList.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ:1012-1662* 2 /trunk/Projects/Axiom/SceneManagers/PCZ:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.2010.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.2010.csproj:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.2010.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.csproj
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.csproj:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Axiom.SceneManagers.PortalConnected.csproj:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Capsule.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Capsule.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Capsule.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/DefaultZone.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/DefaultZone.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/DefaultZone.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/MovableObjectFactory.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/MovableObjectFactory.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/MovableObjectFactory.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCPlane.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCPlane.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCPlane.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZCamera.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZCamera.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZCamera.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZFrustum.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZFrustum.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZFrustum.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZLight.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZLight.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZLight.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZPPlugin.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZPPlugin.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZPPlugin.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZSceneManager.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZSceneManager.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZSceneManager.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZSceneNode.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZSceneNode.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZSceneNode.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZSceneQuery.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZSceneQuery.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZSceneQuery.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZone.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZone.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZone.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/PCZoneFactory.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/PCZoneFactory.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/PCZoneFactory.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Portal.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Portal.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Portal.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Properties
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Properties:1012-1662* 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Properties:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Properties/AssemblyInfo.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Properties/AssemblyInfo.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Properties/AssemblyInfo.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/Segment.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/Segment.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/Segment.cs:1842-1861
-
- Property svn:mergeinfo
-
branches/ogre_1.7_update/Projects/Axiom/SceneManagers/PCZ/VisibleObjectsBoundsInfo.cs
- Property svn:mergeinfo
-
old new 1 1 /branches/crickhollow/Projects/Axiom/Source/SceneManagers/PCZ/VisibleObjectsBoundsInfo.cs:1012-1662 2 /trunk/Projects/Axiom/SceneManagers/PCZ/VisibleObjectsBoundsInfo.cs:1842-1861
-
- Property svn:mergeinfo
