Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ryan Delaney 2014-06-05 15:39:02 -07:00
commit cc0b7d0560
2 changed files with 6 additions and 2 deletions

View File

@ -486,10 +486,13 @@ STICKY_OTHER_WRITABLE 48;5;235;38;5;139;3
# state files # state files
.pid 38;5;248 .pid 38;5;248
.state 38;5;248 .state 38;5;248
# state dumps # error logs
.dump 38;5;241
.err 38;5;160;1 .err 38;5;160;1
.error 38;5;160;1 .error 38;5;160;1
.stderr 38;5;160;1
# state dumps
.dump 38;5;241
.stackdump 38;5;241
.zcompdump 38;5;241 .zcompdump 38;5;241
.zwc 38;5;241 .zwc 38;5;241
# tcpdump, network traffic capture # tcpdump, network traffic capture

View File

@ -67,6 +67,7 @@ Here's a screenshot:
LEGAL LEGAL
===== =====
© Copyright 2014 Magnus Woldrich. © Copyright 2014 Magnus Woldrich.
This program is distributed in the hope that it will be useful, but WITHOUT ANY This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the Perl Artistic License for more details. PARTICULAR PURPOSE. See the Perl Artistic License for more details.