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/images | |
| 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/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 | |||
