aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure/com.etherpad
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-04-17 00:23:48 +0200
committerEgil Moeller <egil.moller@freecode.no>2010-04-17 00:23:48 +0200
commitab980cb586124550f7efac28d1b5cd31b2df5f0c (patch)
tree667ced3b9227fc6ab7ff1d45ad0129f171951d94 /infrastructure/com.etherpad
parent630d57aa4d017cca3d12f234497e9832005c3ded (diff)
parent009b92e3425f9d0fa764e02a191bd139b4f8ae1c (diff)
downloadetherpad-ab980cb586124550f7efac28d1b5cd31b2df5f0c.tar.gz
etherpad-ab980cb586124550f7efac28d1b5cd31b2df5f0c.tar.xz
etherpad-ab980cb586124550f7efac28d1b5cd31b2df5f0c.zip
Merge branch 'master' of git://github.com/shomeya/pad
Diffstat (limited to 'infrastructure/com.etherpad')
-rw-r--r--infrastructure/com.etherpad/licensing.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala
index 9318f78..68019f5 100644
--- a/infrastructure/com.etherpad/licensing.scala
+++ b/infrastructure/com.etherpad/licensing.scala
@@ -134,7 +134,7 @@ object Licensing {
println("Done.");
}
case "genmainkey" => {
- println("Generating key for etherpad.com...");
+ println("Generating main key...");
config.values("licenseGeneratorKey") = args(1);
val out = new PrintWriter(new FileOutputStream(args(2)));
out.print(generateKey("etherpad", "AppJet", -1, 0, -1, 0, 0, 0))