aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/images
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /js/panels/Timeline/TimelinePanel.reel/images
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/images')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/pause.pngbin0 -> 1076 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play.pngbin0 -> 1190 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_next.pngbin0 -> 1185 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_prev.pngbin0 -> 1199 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/plus.pngbin0 -> 1133 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/timetick.jpgbin0 -> 737 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/trash.pngbin0 -> 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