diff options
| author | Ananya Sen | 2012-04-26 12:57:56 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-04-26 12:57:56 -0700 |
| commit | b2132103b12e499f26e6e0f311d48555a9f733ff (patch) | |
| tree | 2eaa000b460e4be3c8050a369318584b2591e8d7 /images | |
| parent | 07c611323c109aaa2208ebc15a354b81c3f04a0d (diff) | |
| parent | 902dc18296fc78f3b8e67d952c42981d926bb2fc (diff) | |
| download | ninja-b2132103b12e499f26e6e0f311d48555a9f733ff.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'images')
| -rw-r--r-- | images/cursors/penCursors/Pen_.png | bin | 0 -> 182 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_anchorSelect.png | bin | 0 -> 268 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_append.png | bin | 0 -> 210 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_closePath.png | bin | 0 -> 211 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_minus.png | bin | 0 -> 204 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_newPath.png | bin | 0 -> 215 bytes |
| -rw-r--r-- | images/cursors/penCursors/Pen_plus.png | bin | 0 -> 211 bytes |
| -rw-r--r-- | images/cursors/penCursors/penAdd_OLD.png (renamed from images/cursors/penAdd.png) | bin | 3043 -> 3043 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/images/cursors/penCursors/Pen_.png b/images/cursors/penCursors/Pen_.png new file mode 100644 index 00000000..fea41116 --- /dev/null +++ b/images/cursors/penCursors/Pen_.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_anchorSelect.png b/images/cursors/penCursors/Pen_anchorSelect.png new file mode 100644 index 00000000..c05c2312 --- /dev/null +++ b/images/cursors/penCursors/Pen_anchorSelect.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_append.png b/images/cursors/penCursors/Pen_append.png new file mode 100644 index 00000000..1dbb959f --- /dev/null +++ b/images/cursors/penCursors/Pen_append.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_closePath.png b/images/cursors/penCursors/Pen_closePath.png new file mode 100644 index 00000000..8447ddbc --- /dev/null +++ b/images/cursors/penCursors/Pen_closePath.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_minus.png b/images/cursors/penCursors/Pen_minus.png new file mode 100644 index 00000000..41fe47d8 --- /dev/null +++ b/images/cursors/penCursors/Pen_minus.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_newPath.png b/images/cursors/penCursors/Pen_newPath.png new file mode 100644 index 00000000..547731f3 --- /dev/null +++ b/images/cursors/penCursors/Pen_newPath.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penCursors/Pen_plus.png b/images/cursors/penCursors/Pen_plus.png new file mode 100644 index 00000000..192c71fe --- /dev/null +++ b/images/cursors/penCursors/Pen_plus.png | |||
| Binary files differ | |||
diff --git a/images/cursors/penAdd.png b/images/cursors/penCursors/penAdd_OLD.png index c306cc85..c306cc85 100644 --- a/images/cursors/penAdd.png +++ b/images/cursors/penCursors/penAdd_OLD.png | |||
| Binary files differ | |||
