diff options
author | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-22 16:26:41 -0800 |
commit | 0bd1cefea2ab350fad1a891bdc926053b799aafc (patch) | |
tree | 962f559fcc02a3dfeb297d59907e40fa153453f3 /js/panels/Color/colorpanelbase.reel | |
parent | 695bc5082f48dddf66ce31480a4faefc067b38bd (diff) | |
parent | 2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff) | |
download | ninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz |
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'js/panels/Color/colorpanelbase.reel')
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/colorpanelbase.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/colorpanelbase.js | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/img/icon_default.png | bin | 3011 -> 3011 bytes | |||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png | bin | 3036 -> 3036 bytes | |||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/img/icon_swap.png | bin | 2961 -> 2961 bytes | |||
-rwxr-xr-x[-rw-r--r--] | js/panels/Color/colorpanelbase.reel/img/knob.png | bin | 1036 -> 1036 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html index d4330596..d4330596 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html +++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html | |||
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js index ff738bbe..ff738bbe 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js | |||
diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css index e4a0aa12..e4a0aa12 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css +++ b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css | |||
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png index 8e64991f..8e64991f 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/img/icon_default.png +++ b/js/panels/Color/colorpanelbase.reel/img/icon_default.png | |||
Binary files differ | |||
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png index 17164935..17164935 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png +++ b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png | |||
Binary files differ | |||
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png index c2c1681d..c2c1681d 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png +++ b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png | |||
Binary files differ | |||
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png index ecfbfcec..ecfbfcec 100644..100755 --- a/js/panels/Color/colorpanelbase.reel/img/knob.png +++ b/js/panels/Color/colorpanelbase.reel/img/knob.png | |||
Binary files differ | |||