aboutsummaryrefslogtreecommitdiff
path: root/js/stage
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/stage
parent770bcb52422742ff741a88a75ecefbeb90bc9247 (diff)
parent7884c00c1ac6bc2141c0084ac6522562576ddd12 (diff)
downloadninja-754d03da7f5824efe0f259e8bc0703b4ffd832b2.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html2
-rwxr-xr-xjs/stage/binding-view.reel/binding-hud.reel/binding-hud.html2
-rwxr-xr-xjs/stage/binding-view.reel/binding-view.html2
-rw-r--r--js/stage/objects-tray.reel/objects-tray.html2
-rwxr-xr-xjs/stage/stage.reel/stage.html2
5 files changed, 5 insertions, 5 deletions
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html
index 056a31e8..9564cbc8 100755
--- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html
+++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.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.
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
index 5a20bb04..83011c2e 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.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.
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html
index 18f0fa4a..6c41cccc 100755
--- a/js/stage/binding-view.reel/binding-view.html
+++ b/js/stage/binding-view.reel/binding-view.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.
diff --git a/js/stage/objects-tray.reel/objects-tray.html b/js/stage/objects-tray.reel/objects-tray.html
index e3c96614..d23b8f48 100644
--- a/js/stage/objects-tray.reel/objects-tray.html
+++ b/js/stage/objects-tray.reel/objects-tray.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.
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 61a5cd85..0b83b779 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.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.