From ae7eb87564632ce7c676bd728b8ff2710ff0bb83 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 18 Apr 2012 15:44:26 -0700
Subject: Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
 into Snapping_II

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js
---
 assets/images/CL13.png | Bin 0 -> 40537 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 assets/images/CL13.png

(limited to 'assets/images')

diff --git a/assets/images/CL13.png b/assets/images/CL13.png
new file mode 100644
index 00000000..236eb3f8
Binary files /dev/null and b/assets/images/CL13.png differ
-- 
cgit v1.2.3