ViewVC Help
| View Changeset | Root Listing
root/Oni2
Jump to revision: Previous Next
Author: iritscen
Date: Mon Mar 3 03:54:55 2014 UTC (11 years, 7 months ago)
Log Message: 
Testing conflict resolution.

Changed paths

Path Details
DirectoryAE/packages/31000GlassBreakingMoves/oni/level0_Final/
(Copied from AE/packages/31000GlassBreakingMoves/oni/level0_Final, r951) 		replaced
DirectoryAE/packages/31000GlassBreakingMoves/oni/level0_Final/level0_Particles/
(Copied from AE/packages/31000GlassBreakingMoves/oni/level0_Final/level0_Particles, r951) 		replaced
DirectoryAE/packages/31000GlassBreakingMoves/oni/level0_Final/level0_Particles/XML/ deleted