diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/panels/Timeline/TimelinePanel.reel/images | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@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 | |||
