diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-28 15:52:30 +0200 |
| commit | 731d190fecb1976d845f6bd18768ee528b007232 (patch) | |
| tree | 323c63555256ad7e5faa6a9d3c10f957295d0ce1 /program/js/tinymce/skins/lightgray/img | |
| parent | 586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff) | |
| parent | 8763170d224408bb01998d0a3393d2eacfc781ad (diff) | |
Merge branch 'tinymce4'
Conflicts:
program/js/app.js
program/js/editor.js
program/js/tiny_mce/tiny_mce.js
program/steps/utils/spell_html.inc
Diffstat (limited to 'program/js/tinymce/skins/lightgray/img')
| -rw-r--r-- | program/js/tinymce/skins/lightgray/img/anchor.gif | bin | 0 -> 53 bytes |
| -rw-r--r-- | program/js/tinymce/skins/lightgray/img/loader.gif | bin | 0 -> 2608 bytes |
| -rw-r--r-- | program/js/tinymce/skins/lightgray/img/object.gif | bin | 0 -> 152 bytes |
| -rw-r--r-- | program/js/tinymce/skins/lightgray/img/trans.gif | bin | 0 -> 43 bytes |
| -rw-r--r-- | program/js/tinymce/skins/lightgray/img/wline.gif | bin | 0 -> 46 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/program/js/tinymce/skins/lightgray/img/anchor.gif b/program/js/tinymce/skins/lightgray/img/anchor.gif Binary files differnew file mode 100644 index 000000000..606348c7f --- /dev/null +++ b/program/js/tinymce/skins/lightgray/img/anchor.gif diff --git a/program/js/tinymce/skins/lightgray/img/loader.gif b/program/js/tinymce/skins/lightgray/img/loader.gif Binary files differnew file mode 100644 index 000000000..c69e93723 --- /dev/null +++ b/program/js/tinymce/skins/lightgray/img/loader.gif diff --git a/program/js/tinymce/skins/lightgray/img/object.gif b/program/js/tinymce/skins/lightgray/img/object.gif Binary files differnew file mode 100644 index 000000000..cccd7f023 --- /dev/null +++ b/program/js/tinymce/skins/lightgray/img/object.gif diff --git a/program/js/tinymce/skins/lightgray/img/trans.gif b/program/js/tinymce/skins/lightgray/img/trans.gif Binary files differnew file mode 100644 index 000000000..388486517 --- /dev/null +++ b/program/js/tinymce/skins/lightgray/img/trans.gif diff --git a/program/js/tinymce/skins/lightgray/img/wline.gif b/program/js/tinymce/skins/lightgray/img/wline.gif Binary files differnew file mode 100644 index 000000000..7d0a4dbca --- /dev/null +++ b/program/js/tinymce/skins/lightgray/img/wline.gif |
