diff options
| author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
| commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
| tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/Timeline/TimelinePanel.reel/images | |
| parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/images')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/pause.png | bin | 0 -> 1076 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/play.png | bin | 0 -> 1190 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/play_next.png | bin | 0 -> 1185 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/play_prev.png | bin | 0 -> 1199 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/plus.png | bin | 0 -> 1133 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/timetick.jpg | bin | 0 -> 737 bytes |
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/images/trash.png | bin | 0 -> 1154 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/pause.png b/js/panels/Timeline/TimelinePanel.reel/images/pause.png new file mode 100644 index 00000000..8da01b9a --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/pause.png | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/play.png b/js/panels/Timeline/TimelinePanel.reel/images/play.png new file mode 100644 index 00000000..51a34bd4 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/play.png | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/play_next.png b/js/panels/Timeline/TimelinePanel.reel/images/play_next.png new file mode 100644 index 00000000..660130e4 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/play_next.png | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/play_prev.png b/js/panels/Timeline/TimelinePanel.reel/images/play_prev.png new file mode 100644 index 00000000..30a801b2 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/play_prev.png | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/plus.png b/js/panels/Timeline/TimelinePanel.reel/images/plus.png new file mode 100644 index 00000000..83c5ecd9 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/plus.png | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/timetick.jpg b/js/panels/Timeline/TimelinePanel.reel/images/timetick.jpg new file mode 100644 index 00000000..578298b8 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/timetick.jpg | |||
| Binary files differ | |||
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/trash.png b/js/panels/Timeline/TimelinePanel.reel/images/trash.png new file mode 100644 index 00000000..cfc10484 --- /dev/null +++ b/js/panels/Timeline/TimelinePanel.reel/images/trash.png | |||
| Binary files differ | |||
