aboutsummaryrefslogtreecommitdiff
path: root/images
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 16:28:39 -0700
committerJohn Mayhew2012-04-02 16:28:39 -0700
commitb4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree3d8c802473f2395d53d599ec9d8b70b60a4db50c /images
parent5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parentc6de22bf42be90b403491b5f87b1818d9020310c (diff)
downloadninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
Diffstat (limited to 'images')
-rw-r--r--images/cursors/penAdd.pngbin0 -> 3043 bytes
-rwxr-xr-ximages/picker/FileType-DirectoryOpen.pngbin0 -> 1827 bytes
-rwxr-xr-ximages/picker/css_file.pngbin3184 -> 2300 bytes
-rwxr-xr-ximages/picker/doc_file.pngbin11398 -> 2315 bytes
-rwxr-xr-ximages/picker/file.pngbin27869 -> 1551 bytes
-rwxr-xr-ximages/picker/folder.pngbin276680 -> 1622 bytes
-rwxr-xr-ximages/picker/html_file.pngbin3677 -> 2293 bytes
-rwxr-xr-ximages/picker/js_file.pngbin3080 -> 2088 bytes
-rwxr-xr-ximages/picker/json_file.pngbin0 -> 2299 bytes
-rwxr-xr-ximages/picker/php_file.pngbin5182 -> 2280 bytes
-rwxr-xr-ximages/picker/pl_file.pngbin0 -> 2094 bytes
-rwxr-xr-ximages/picker/py_file.pngbin0 -> 2067 bytes
-rwxr-xr-ximages/picker/rb_file.pngbin0 -> 2301 bytes
-rwxr-xr-ximages/picker/txt_file.pngbin13898 -> 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 16:54:16 +0000