aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/images
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/panels/Timeline/TimelinePanel.reel/images
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/images')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.pngbin0 -> 1083 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/icon-gear.pngbin0 -> 1397 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.png b/js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.png
new file mode 100644
index 00000000..64449a5a
--- /dev/null
+++ b/js/panels/Timeline/TimelinePanel.reel/images/icon-checkmark.png
Binary files differ
diff --git a/js/panels/Timeline/TimelinePanel.reel/images/icon-gear.png b/js/panels/Timeline/TimelinePanel.reel/images/icon-gear.png
new file mode 100644
index 00000000..9b324f65
--- /dev/null
+++ b/js/panels/Timeline/TimelinePanel.reel/images/icon-gear.png
Binary files differ