aboutsummaryrefslogtreecommitdiff
path: root/js/panels/objects/objects-panel.reel/objects-panel.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-09 17:33:00 -0700
committerJohn Mayhew2012-07-09 17:33:00 -0700
commit754d03da7f5824efe0f259e8bc0703b4ffd832b2 (patch)
tree10d7055250dc6d86c3ec18eee078a7eb9a7b1a5f /js/panels/objects/objects-panel.reel/objects-panel.html
parent770bcb52422742ff741a88a75ecefbeb90bc9247 (diff)
parent7884c00c1ac6bc2141c0084ac6522562576ddd12 (diff)
downloadninja-754d03da7f5824efe0f259e8bc0703b4ffd832b2.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/objects/objects-panel.reel/objects-panel.html')
-rw-r--r--js/panels/objects/objects-panel.reel/objects-panel.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.html b/js/panels/objects/objects-panel.reel/objects-panel.html
index e7da3be9..ebdfcf8a 100644
--- a/js/panels/objects/objects-panel.reel/objects-panel.html
+++ b/js/panels/objects/objects-panel.reel/objects-panel.html
@@ -1,4 +1,4 @@
1<!doctype html> 1<!DOCTYPE HTML>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.