diff options
| author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
| commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
| tree | c64660f7f69840cac5186fd730221335bd0a67af /js/components/treeview/branch.reel | |
| parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-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/branch.reel')
| -rw-r--r-- | js/components/treeview/branch.reel/branch.css | 6 | ||||
| -rw-r--r-- | js/components/treeview/branch.reel/branch.html | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css index 5998e0f0..0f4e4a87 100644 --- a/js/components/treeview/branch.reel/branch.css +++ b/js/components/treeview/branch.reel/branch.css | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 1 | .treeRoot > .branch > ul { | 7 | .treeRoot > .branch > ul { |
| 2 | margin-top: 0; | 8 | margin-top: 0; |
| 3 | } | 9 | } |
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index 31a4cf18..b44a54c5 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.html | |||
| @@ -1,4 +1,9 @@ | |||
| 1 | <!DOCTYPE html> | 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> --> | ||
| 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" /> |