diff options
| author | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
| commit | f7f445e8ced728d04de4bf1c5711f6756488a71e (patch) | |
| tree | b09f00c28ff7123354af40509283ddec846f438d /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css | |
| parent | 632a5daca17acb774b9344ccc0e9107f1643924c (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css')
| -rwxr-xr-x | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css deleted file mode 100755 index 7f1b0f7f..00000000 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 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 | |||