diff options
| author | Eric Guzman | 2012-03-17 00:05:14 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-17 00:05:14 -0700 |
| commit | a3192d8bc0f8c0698265817c14dcd2284fd89d7d (patch) | |
| tree | 497ac55f550ed52f9d73b464aafb2aa6cb5f5038 /images | |
| parent | a6a6f9bcc5ff92f5bb5e9275336dfaec2d8e8f4c (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-a3192d8bc0f8c0698265817c14dcd2284fd89d7d.tar.gz | |
Merge branch 'refs/heads/master' into AddAnimationsLibrary
Conflicts:
js/panels/presets/default-transition-presets.js
Diffstat (limited to 'images')
| -rw-r--r-- | images/cursors/penAdd.png | bin | 0 -> 3043 bytes |
| -rwxr-xr-x | images/picker/FileType-DirectoryOpen.png | bin | 0 -> 1827 bytes |
| -rwxr-xr-x | images/picker/css_file.png | bin | 3184 -> 2300 bytes |
| -rwxr-xr-x | images/picker/doc_file.png | bin | 11398 -> 2315 bytes |
| -rwxr-xr-x | images/picker/file.png | bin | 27869 -> 1551 bytes |
| -rwxr-xr-x | images/picker/folder.png | bin | 276680 -> 1622 bytes |
| -rwxr-xr-x | images/picker/html_file.png | bin | 3677 -> 2293 bytes |
| -rwxr-xr-x | images/picker/js_file.png | bin | 3080 -> 2088 bytes |
| -rwxr-xr-x | images/picker/json_file.png | bin | 0 -> 2299 bytes |
| -rwxr-xr-x | images/picker/php_file.png | bin | 5182 -> 2280 bytes |
| -rwxr-xr-x | images/picker/pl_file.png | bin | 0 -> 2094 bytes |
| -rwxr-xr-x | images/picker/py_file.png | bin | 0 -> 2067 bytes |
| -rwxr-xr-x | images/picker/rb_file.png | bin | 0 -> 2301 bytes |
| -rwxr-xr-x | images/picker/txt_file.png | bin | 13898 -> 2198 bytes |
14 files changed, 0 insertions, 0 deletions
diff --git a/images/cursors/penAdd.png b/images/cursors/penAdd.png new file mode 100644 index 00000000..c306cc85 --- /dev/null +++ b/images/cursors/penAdd.png | |||
| Binary files differ | |||
diff --git a/images/picker/FileType-DirectoryOpen.png b/images/picker/FileType-DirectoryOpen.png new file mode 100755 index 00000000..0211ca4d --- /dev/null +++ b/images/picker/FileType-DirectoryOpen.png | |||
| Binary files differ | |||
diff --git a/images/picker/css_file.png b/images/picker/css_file.png index dc7aaf7a..e46233fa 100755 --- a/images/picker/css_file.png +++ b/images/picker/css_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/doc_file.png b/images/picker/doc_file.png index 13743fd0..ef3143ef 100755 --- a/images/picker/doc_file.png +++ b/images/picker/doc_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/file.png b/images/picker/file.png index 13e476e6..d179ad72 100755 --- a/images/picker/file.png +++ b/images/picker/file.png | |||
| Binary files differ | |||
diff --git a/images/picker/folder.png b/images/picker/folder.png index bbeaf2a3..bd552af5 100755 --- a/images/picker/folder.png +++ b/images/picker/folder.png | |||
| Binary files differ | |||
diff --git a/images/picker/html_file.png b/images/picker/html_file.png index 596cc55b..bbce4ee3 100755 --- a/images/picker/html_file.png +++ b/images/picker/html_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/js_file.png b/images/picker/js_file.png index 95353fc8..997a573e 100755 --- a/images/picker/js_file.png +++ b/images/picker/js_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/json_file.png b/images/picker/json_file.png new file mode 100755 index 00000000..119d26e7 --- /dev/null +++ b/images/picker/json_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/php_file.png b/images/picker/php_file.png index c26fa0cc..be8b7673 100755 --- a/images/picker/php_file.png +++ b/images/picker/php_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/pl_file.png b/images/picker/pl_file.png new file mode 100755 index 00000000..989abcb6 --- /dev/null +++ b/images/picker/pl_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/py_file.png b/images/picker/py_file.png new file mode 100755 index 00000000..88d1fd54 --- /dev/null +++ b/images/picker/py_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/rb_file.png b/images/picker/rb_file.png new file mode 100755 index 00000000..e6df7109 --- /dev/null +++ b/images/picker/rb_file.png | |||
| Binary files differ | |||
diff --git a/images/picker/txt_file.png b/images/picker/txt_file.png index 30887605..bef97b38 100755 --- a/images/picker/txt_file.png +++ b/images/picker/txt_file.png | |||
| Binary files differ | |||
