diff options
author | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-22 10:32:03 -0700 |
commit | 7b76e4664b35f044e9f24c060f1e092cb5e5c4b0 (patch) | |
tree | f0f6168b083aa929d34f37edca6c87ce7c3743bd /js/components/tools-properties/brush-properties.reel/brush-properties.css | |
parent | 0dc43f8b6d7db6d9ed698e8c4568e942d8e3d8eb (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-7b76e4664b35f044e9f24c060f1e092cb5e5c4b0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.css')
-rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.css | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.css b/js/components/tools-properties/brush-properties.reel/brush-properties.css index 7f1b0f7f..102a79db 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.css +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.css | |||
@@ -3,4 +3,5 @@ | |||
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> */ |
6 | |||
6 | 7 | ||