From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 6 Sep 2011 14:30:04 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1791^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5be96f42d229ac05c643b4765a20d891dd4a2624;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	wcfsetup/install/files/acp/js/WCF.ACP.js
	wcfsetup/install/files/js/WCF.js
---

5be96f42d229ac05c643b4765a20d891dd4a2624
diff --cc wcfsetup/install/files/acp/js/WCF.ACP.js
index 51ad383f02,4af13911f7..ecb5779700
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@@ -487,21 -487,12 +487,23 @@@ WCF.ACP.Options.prototype = 
  			}
  		}
  	}
++
++
  };
  
 +/**
 + * Namespace for WCF.ACP.User
 + */
  WCF.ACP.User = {};
  
 +/**
 + * UserList clipboard API
 + */
  WCF.ACP.User.List = function() { this.init(); };
  WCF.ACP.User.List.prototype = {
 +	/**
 +	 * Initializes the UserList clipboard API.
 +	 */
  	init: function() {
  		$('body').bind('clipboardAction', $.proxy(this.handleClipboardEvent, this));
  	},
diff --cc wcfsetup/install/files/js/WCF.js
index a8f93aa497,46b885ee32..141ac6ee9d
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@@ -408,6 -408,6 +408,7 @@@ $.extend(WCF, 
  });
  
  /**
++
   * Clipboard API
   */
  WCF.Clipboard = {