aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-22 10:32:03 -0700
committerJonathan Duran2012-05-22 10:32:03 -0700
commit7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch)
treef0f6168b083aa929d34f37edca6c87ce7c3743bd /js/components/tools-properties/pencil-properties.reel/pencil-properties.html
parent0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties/pencil-properties.reel/pencil-properties.html')
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html31
1 files changed, 0 insertions, 31 deletions
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
deleted file mode 100755
index cbe626b2..00000000
--- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
+++ /dev/null
@@ -1,31 +0,0 @@
1<!DOCTYPE HTML>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No 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> -->
7<html>
8 <head>
9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
10 <link rel="stylesheet" type="text/css" href="pencil-properties.css">
11
12 <script type="text/montage-serialization">
13 {
14
15 "owner": {
16 "prototype": "js/components/tools-properties/pencil-properties.reel",
17 "properties": {
18 "element": {"#": "pencilProperties"}
19 }
20 }
21 }
22 </script>
23
24 </head>
25
26 <body>
27 <div data-montage-id="pencilProperties" class="subToolHolderPanel">
28 </div>
29 </body>
30
31</html> \ No newline at end of file