ignore this

OpenXRay · Sep 19, 2014 · 379a56f · 379a56f
2 parents f3f3cf1 + 96044f5
commit 379a56f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Layers/xrRender/DetailManager_VS.cpp b/Layers/xrRender/DetailManager_VS.cpp
@@ -319,11 +319,15 @@ void	CDetailManager::hw_Render_dump		(ref_constant x_array, u32 var_id, u32 lod_
 				RCache.stat.r.s_details.add	(dwCNT_verts);
 			}
 			// Clean up
+<<<<<<< HEAD
 			vis.clear_not_free			();
+=======
+      vis.clear_not_free ();      
+>>>>>>> origin/master
 		}
 		vOffset		+=	hw_BatchSize * Object.number_vertices;
 		iOffset		+=	hw_BatchSize * Object.number_indices;
 	}
 }
 
-#endif	//	USE_DX10
+#endif	//	USE_DX10
diff --git a/cop changelog.txt b/cop changelog.txt