diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /images/optionsbar/tag | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'images/optionsbar/tag')
| -rw-r--r-- | images/optionsbar/tag/canvas-tag.png | bin | 0 -> 1529 bytes |
| -rw-r--r-- | images/optionsbar/tag/custom-tag.png | bin | 0 -> 738 bytes |
| -rw-r--r-- | images/optionsbar/tag/div-tag.png | bin | 0 -> 637 bytes |
| -rw-r--r-- | images/optionsbar/tag/img-tag.png | bin | 0 -> 715 bytes |
| -rw-r--r-- | images/optionsbar/tag/vid-tag.png | bin | 0 -> 389 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/images/optionsbar/tag/canvas-tag.png b/images/optionsbar/tag/canvas-tag.png new file mode 100644 index 00000000..daf6036e --- /dev/null +++ b/images/optionsbar/tag/canvas-tag.png | |||
| Binary files differ | |||
diff --git a/images/optionsbar/tag/custom-tag.png b/images/optionsbar/tag/custom-tag.png new file mode 100644 index 00000000..98c560ad --- /dev/null +++ b/images/optionsbar/tag/custom-tag.png | |||
| Binary files differ | |||
diff --git a/images/optionsbar/tag/div-tag.png b/images/optionsbar/tag/div-tag.png new file mode 100644 index 00000000..2a2bac2e --- /dev/null +++ b/images/optionsbar/tag/div-tag.png | |||
| Binary files differ | |||
diff --git a/images/optionsbar/tag/img-tag.png b/images/optionsbar/tag/img-tag.png new file mode 100644 index 00000000..7a1c6e79 --- /dev/null +++ b/images/optionsbar/tag/img-tag.png | |||
| Binary files differ | |||
diff --git a/images/optionsbar/tag/vid-tag.png b/images/optionsbar/tag/vid-tag.png new file mode 100644 index 00000000..e72bac5a --- /dev/null +++ b/images/optionsbar/tag/vid-tag.png | |||
| Binary files differ | |||
