aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/images
diff options
context:
space:
mode:
authorhwc4872012-04-27 14:35:46 -0700
committerhwc4872012-04-27 14:35:46 -0700
commit1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch)
tree3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/panels/Timeline/TimelinePanel.reel/images
parent5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
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