Merge branch 't/9642'

ckeditor · Nov 16, 2012 · a7caa20 · a7caa20
2 parents 608603f + d880027
commit a7caa20
Show file tree

Hide file tree

Showing 137 changed files with 2 additions and 5,330 deletions.
diff --git a/config.js b/config.js
@@ -49,7 +49,6 @@ CKEDITOR.editorConfig = function( config ) {
 		'removeformat,' +
 		'resize,' +
 		'save,' +
-		'scayt,' +
 		'selectall,' +
 		'showblocks,' +
 		'showborders,' +
@@ -63,7 +62,6 @@ CKEDITOR.editorConfig = function( config ) {
 		'templates,' +
 		'toolbar,' +
 		'undo,' +
-		'wsc,' +
 		'wysiwygarea';
 	// %REMOVE_END%
 };

diff --git a/dev/builder/build-config.js b/dev/builder/build-config.js
@@ -53,7 +53,6 @@ var CKBUILDER_CONFIG = {
 		removeformat : 1,
 		resize : 1,
 		save : 1,
-		scayt : 1,
 		selectall : 1,
 		showblocks : 1,
 		showborders : 1,
@@ -67,7 +66,6 @@ var CKBUILDER_CONFIG = {
 		templates : 1,
 		toolbar : 1,
 		undo : 1,
-		wsc : 1,
 		wysiwygarea : 1
 	}
 };