aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/tools-properties/subselection-properties.reel/subselection-properties.html
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/subselection-properties.reel/subselection-properties.html')
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html32
1 files changed, 0 insertions, 32 deletions
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
deleted file mode 100755
index bde47659..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
+++ /dev/null
@@ -1,32 +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
11 <!--<link rel="stylesheet" type="text/css" href="tools-properties.css">-->
12 <script type="text/montage-serialization">
13 {
14
15 "owner": {
16 "prototype": "js/components/tools-properties/subselection-properties.reel[SubSelectionProperties]",
17 "properties": {
18 "element": {"#": "subSelectionProperties"}
19 }
20 }
21 }
22 </script>
23
24 </head>
25
26 <body>
27 <div data-montage-id="subSelectionProperties">
28 <div></div>
29 </div>
30 </body>
31
32</html> \ No newline at end of file