From d6284b4d22d1e6912b01228b7d2a63e9fecbc5fb Mon Sep 17 00:00:00 2001 From: till Date: Wed, 2 Nov 2011 15:13:42 +0000 Subject: check-in 3.4.6 (without moxieplayer due to a content-spoofing vulnerability) --- .../tiny_mce/plugins/table/merge_cells.htm | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 program/js/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm (limited to 'program/js/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm') diff --git a/program/js/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm b/program/js/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm new file mode 100644 index 000000000..d231090e7 --- /dev/null +++ b/program/js/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm @@ -0,0 +1,32 @@ + + + + {#table_dlg.merge_cells_title} + + + + + + +
+
+ {#table_dlg.merge_cells_title} + + + + + + + + + +
:
:
+
+ +
+ + +
+
+ + -- cgit v1.2.3