aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/leaf.reel/leaf.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-08 15:42:40 -0800
committerPushkar Joshi2012-02-08 15:42:40 -0800
commit18243deb66ab14a014756bfb0be1a52648c7771a (patch)
treec64660f7f69840cac5186fd730221335bd0a67af /js/components/treeview/leaf.reel/leaf.html
parent802e92eb70b00849dadacf2c6590d27edbe65d99 (diff)
parent0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff)
downloadninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz
Merge branch 'master' into pentool
Conflicts: js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to 'js/components/treeview/leaf.reel/leaf.html')
-rw-r--r--js/components/treeview/leaf.reel/leaf.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 991a4323..cf0b4e40 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -1,4 +1,9 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright>
3This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6</copyright> -->
2<html lang="en"> 7<html lang="en">
3<head> 8<head>
4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />