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, 109 deletions

diff --git a/trunk/infrastructure/rhino1_7R1/examples/NervousText.js b/trunk/infrastructure/rhino1_7R1/examples/NervousText.js
deleted file mode 100644
index a2f82fe..0000000
--- a/trunk/infrastructure/rhino1_7R1/examples/NervousText.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (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.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Rhino code, released May 6, 1999.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1997-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License Version 2 or later (the "GPL"), in which
- * case the provisions of the GPL are applicable instead of those above. If
- * you wish to allow use of your version of this file only under the terms of
- * the GPL and not to allow others to use your version of this file under the
- * MPL, indicate your decision by deleting the provisions above and replacing
- * them with the notice and other provisions required by the GPL. If you do
- * not delete the provisions above, a recipient may use your version of this
- * file under either the MPL or the GPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// The Java "NervousText" example ported to JavaScript.
-// Compile using java org.mozilla.javascript.tools.jsc.Main -extends java.applet.Applet -implements java.lang.Runnable NervousText.js
-/*
-Adapted from Java code by
-    Daniel Wyszynski
-    Center for Applied Large-Scale Computing (CALC)
-    04-12-95
-
-    Test of text animation.
-
-    kwalrath: Changed string; added thread suspension. 5-9-95
-*/
-var Font = java.awt.Font;
-var Thread = java.lang.Thread;
-var separated;
-var s = null;
-var killme = null;
-var i;
-var x_coord = 0, y_coord = 0;
-var num;
-var speed=35;
-var counter =0;
-var threadSuspended = false; //added by kwalrath
-
-function init() {
-        this.resize(150,50);
-        this.setFont(new Font("TimesRoman",Font.BOLD,36));
-        s = this.getParameter("text");
-        if (s == null) {
-            s = "Rhino";
-        }
-        separated = s.split('');
-}
-
-function start() {
-        if(killme == null)
-        {
-        killme = new java.lang.Thread(java.lang.Runnable(this));
-        killme.start();
-        }
-}
-
-function stop() {
-        killme = null;
-}
-
-function run() {
-        while (killme != null) {
-        try {Thread.sleep(100);} catch (e){}
-            this.repaint();
-        }
-        killme = null;
-}
-
-function paint(g) {
-        for(i=0;i<separated.length;i++)
-        {
-        x_coord = Math.random()*10+15*i;
-        y_coord = Math.random()*10+36;
-        g.drawChars(separated, i,1,x_coord,y_coord);
-        }
-}
-
-/* Added by kwalrath. */
-function mouseDown(evt, x, y) {
-        if (threadSuspended) {
-            killme.resume();
-        }
-        else {
-            killme.suspend();
-        }
-        threadSuspended = !threadSuspended;
-    return true;
-}
-