diff options
| author | Henrik Nord <[email protected]> | 2015-05-20 09:58:49 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-05-20 09:59:00 +0200 |
| commit | 2cfbcabd62f5473add108244f7e3a231832706f3 (patch) | |
| tree | 261c0573a13e5e5e717a0f478721c688c440f02a /lib/stdlib/src/shell_default.erl | |
| parent | 7cedd7e123d85365782500251ab87125002ebd17 (diff) | |
| parent | 6e24ffab6c682383a1c284fc066e59c680c4c62e (diff) | |
| download | otp-2cfbcabd62f5473add108244f7e3a231832706f3.tar.gz otp-2cfbcabd62f5473add108244f7e3a231832706f3.tar.bz2 otp-2cfbcabd62f5473add108244f7e3a231832706f3.zip | |
Merge branch 'richcarl/add-uptime-function'
* richcarl/add-uptime-function:
Add uptime() shell command
OTP-12752
Diffstat (limited to 'lib/stdlib/src/shell_default.erl')
| -rw-r--r-- | lib/stdlib/src/shell_default.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/src/shell_default.erl b/lib/stdlib/src/shell_default.erl index 3fe359af0e..0fca7ff8c7 100644 --- a/lib/stdlib/src/shell_default.erl +++ b/lib/stdlib/src/shell_default.erl @@ -23,7 +23,7 @@ -module(shell_default). -export([help/0,lc/1,c/1,c/2,nc/1,nl/1,l/1,i/0,pid/3,i/3,m/0,m/1, - memory/0,memory/1, + memory/0,memory/1,uptime/0, erlangrc/1,bi/1, regs/0, flush/0,pwd/0,ls/0,ls/1,cd/1, y/1, y/2, xm/1, bt/1, q/0, @@ -92,6 +92,7 @@ pid(X,Y,Z) -> c:pid(X,Y,Z). pwd() -> c:pwd(). q() -> c:q(). regs() -> c:regs(). +uptime() -> c:uptime(). xm(Mod) -> c:xm(Mod). y(File) -> c:y(File). y(File, Opts) -> c:y(File, Opts). |