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/tools-properties/shape-properties.reel/shape-properties.css | |
| 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/tools-properties/shape-properties.reel/shape-properties.css')
| -rw-r--r-- | js/components/tools-properties/shape-properties.reel/shape-properties.css | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.css b/js/components/tools-properties/shape-properties.reel/shape-properties.css index 1e36b0bd..0441c1cf 100644 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.css +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.css | |||
| @@ -2,8 +2,4 @@ | |||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 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. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ \ No newline at end of file |
| 6 | |||
| 7 | #strokeIcon { | ||
| 8 | float: left; | ||
| 9 | } \ No newline at end of file | ||