Merge remote-tracking branch 'niallo/master'

dbrans · Apr 4, 2013 · d9ecc08 · d9ecc08
2 parents 440f876 + c4f4314
commit d9ecc08
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/bin/BrowserStackTunnel.jar b/bin/BrowserStackTunnel.jar
diff --git a/bin/cli.js b/bin/cli.js
@@ -16,7 +16,7 @@ cmd.version(version)
 .option('--os', 'The os of the browser or device. Defaults to win.')
 .option('-t, --timeout <seconds>', "Launch duration after which browsers exit.")
 .option('--attach', "Attach process to remote browser.")
-.option('-k, --key', "Tunneling key.")
+.option('-k, --key <key>', "Tunneling key.")
 .option('--ssl', "ssl flag for tunnel.")
 .option('--debug', "Debug mode. More verbose output.");