diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-23 13:11:40 +0000 |
| commit | 8c2ed3e9b7805d10816f461c713c63a8363fa61a (patch) | |
| tree | 5a12eaf4c91c09c7cba55c06de0cebd1ae0867d2 /usr/src/lib/libcurses/screen | |
| parent | dda1f9a81f5e81013b6df1dd838f8a23774ed0b5 (diff) | |
| parent | 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e (diff) | |
| download | illumos-joyent-8c2ed3e9b7805d10816f461c713c63a8363fa61a.tar.gz | |
[illumos-gate merge]
commit 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e
7837 smbios3 64-bit entry point support
commit ec2c76eb1d5ecd7a4fccccefc1bc4aa7c1531606
7854 installboot should set MBR to load partition boot block if it was installed
commit 48bbca816818409505a6e214d0911fda44e622e3
7812 Remove gender specific language
commit e40108ff341f07fe03e96c751c6cf2cb5867d1a8
7898 mdb's ::netstat doesn't print UDP conn_t pointer correctly
Conflicts:
usr/src/uts/common/syscall/poll.c
Diffstat (limited to 'usr/src/lib/libcurses/screen')
| -rw-r--r-- | usr/src/lib/libcurses/screen/tputs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/libcurses/screen/tputs.c b/usr/src/lib/libcurses/screen/tputs.c index f16ad967a5..c364dbdb09 100644 --- a/usr/src/lib/libcurses/screen/tputs.c +++ b/usr/src/lib/libcurses/screen/tputs.c @@ -22,6 +22,7 @@ /* * Copyright 1997 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1988 AT&T */ @@ -62,7 +63,7 @@ _tpad(char *cp, int affcnt, int (*outc)(char x)) * in their terminfo entries, as that would break compatibility. * We therefore, do it here. * - * When compatibility is to be broken, his will go away + * When compatibility is to be broken, it will go away * and users will be informed that they MUST use mandatory * padding for flash and bell. */ |