Software / code / prosody
Changeset
1083:70465a6ef757
Merge with 0.4
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 01 May 2009 23:29:40 +0100 |
| parents | 1079:84e6455be8ed (current diff) 1082:f58394b9ba66 (diff) |
| children | 1088:7cf44a5c0991 |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/HACKERS Thu Apr 30 03:05:56 2009 +0100 +++ b/HACKERS Fri May 01 23:29:40 2009 +0100 @@ -1,5 +1,10 @@ Welcome hackers! -This project accepts and *encourages* contributions. If you would like to get involved you can join us on our mailing list and discussion rooms. More information on these at http://prosody.im/discuss +This project accepts and *encourages* contributions. If you would like to get +involved you can join us on our mailing list and discussion rooms. More +information on these at http://prosody.im/discuss -Patches are welcome, though before sending we would appreciate if you read docs/coding_style.txt for guidelines on how to format your code, and are comfortable with copyright of contributions being assigned to the core developers. +Patches are welcome, though before sending we would appreciate if you read +docs/coding_style.txt for guidelines on how to format your code, and are +comfortable with copyright of contributions being assigned to the core +developers.
--- a/configure Thu Apr 30 03:05:56 2009 +0100 +++ b/configure Fri May 01 23:29:40 2009 +0100 @@ -86,7 +86,7 @@ OSTYPE="$value" OSTYPE_SET=yes ;; - --data-dir=*) + --datadir=*) DATADIR="$value" DATADIR_SET=yes ;;
--- a/core/loggingmanager.lua Thu Apr 30 03:05:56 2009 +0100 +++ b/core/loggingmanager.lua Fri May 01 23:29:40 2009 +0100 @@ -122,6 +122,7 @@ --- Definition of built-in logging sinks --- +-- Null sink, must enter log_sink_types *first* function log_sink_types.nowhere() return function () return false; end; end
