aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/treeview.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-09 13:23:07 -0800
committerNivesh Rajbhandari2012-02-09 13:23:07 -0800
commit148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch)
tree889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js/components/treeview/treeview.reel
parenta9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff)
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
downloadninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/treeview/treeview.reel')
-rw-r--r--js/components/treeview/treeview.reel/treeview.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index d70b016c..4f9e6a72 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -26,7 +26,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
26 "name" : "Branch" 26 "name" : "Branch"
27 }, 27 },
28 "defaultLeaf" : { 28 "defaultLeaf" : {
29 "module" : "js/components/treeview/presets-leaf.reel", 29 "module" : "js/components/treeview/leaf.reel",
30 "name" : "Leaf" 30 "name" : "Leaf"
31 }, 31 },
32 "scrollview": { 32 "scrollview": {