Merge remote branch 'upstream/master'

Conflicts:
	etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
	etherpad/src/etherpad/control/pro/pro_main_control.js
	etherpad/src/etherpad/control/pro_help_control.js
	etherpad/src/etherpad/globals.js
	etherpad/src/etherpad/legacy_urls.js
	etherpad/src/etherpad/pne/pne_utils.js
	etherpad/src/etherpad/pro/pro_utils.js
	etherpad/src/main.js
	etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
	etherpad/src/plugins/testplugin/templates/page.ejs
	etherpad/src/static/css/pad2_ejs.css
	etherpad/src/static/css/pro-help.css
	etherpad/src/static/img/jun09/pad/protop.gif
	etherpad/src/static/js/store.js
	etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
	etherpad/src/themes/default/templates/main/home.ejs
	etherpad/src/themes/default/templates/pro-help/main.ejs
	etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
	infrastructure/com.etherpad/licensing.scala
	trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
	trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
	trunk/etherpad/src/static/css/home-opensource.css
	trunk/etherpad/src/static/js/ace.js
	trunk/etherpad/src/static/js/linestylefilter_client.js
	trunk/etherpad/src/templates/email/eepnet_license_info.ejs
	trunk/etherpad/src/templates/pad/pad_body2.ejs
	trunk/etherpad/src/templates/pad/pad_content.ejs
	trunk/etherpad/src/templates/pad/padfull_body.ejs
	trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs

1 files changed, 0 insertions, 88 deletions

diff --git a/trunk/infrastructure/ace/www/cssmanager.js b/trunk/infrastructure/ace/www/cssmanager.js
deleted file mode 100644
index a5c549b..0000000
--- a/trunk/infrastructure/ace/www/cssmanager.js
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-/**
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS-IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-function makeCSSManager(emptyStylesheetTitle) {
-
-  function getSheetByTitle(title) {
-    var allSheets = document.styleSheets;
-    for(var i=0;i<allSheets.length;i++) {
-      var s = allSheets[i];
-      if (s.title == title) {
-	return s;
-      }
-    }
-    return null;
-  }
-
-  /*function getSheetTagByTitle(title) {
-    var allStyleTags = document.getElementsByTagName("style");
-    for(var i=0;i<allStyleTags.length;i++) {
-      var t = allStyleTags[i];
-      if (t.title == title) {
-	return t;
-      }
-    }
-    return null;
-  }*/
-
-  var browserSheet = getSheetByTitle(emptyStylesheetTitle);
-  //var browserTag = getSheetTagByTitle(emptyStylesheetTitle);
-  function browserRules() { return (browserSheet.cssRules || browserSheet.rules); }
-  function browserDeleteRule(i) {
-    if (browserSheet.deleteRule) browserSheet.deleteRule(i);
-    else browserSheet.removeRule(i);
-  }
-  function browserInsertRule(i, selector) {
-    if (browserSheet.insertRule) browserSheet.insertRule(selector+' {}', i);
-    else browserSheet.addRule(selector, null, i);
-  }
-  var selectorList = [];
-
-  function indexOfSelector(selector) {
-    for(var i=0;i<selectorList.length;i++) {
-      if (selectorList[i] == selector) {
-	return i;
-      }
-    }
-    return -1;
-  }
-
-  function selectorStyle(selector) {
-    var i = indexOfSelector(selector);
-    if (i < 0) {
-      // add selector
-      browserInsertRule(0, selector);
-      selectorList.splice(0, 0, selector);
-      i = 0;
-    }
-    return browserRules().item(i).style;
-  }
-
-  function removeSelectorStyle(selector) {
-    var i = indexOfSelector(selector);
-    if (i >= 0) {
-      browserDeleteRule(i);
-      selectorList.splice(i, 1);
-    }
-  }
-
-  return {selectorStyle:selectorStyle, removeSelectorStyle:removeSelectorStyle,
-	  info: function() {
-	    return selectorList.length+":"+browserRules().length;
-	  }};
-}