diff --git a/ChangeLog b/ChangeLog index 8b2520f03..a7033ba72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-05-22 Badlop + + * README: R12 support: remove compilation warning (EJAB-630) + 2008-05-19 Badlop * doc/guide.html: Updated diff --git a/README b/README index e4940246f..df5c68281 100644 --- a/README +++ b/README @@ -9,9 +9,7 @@ To compile ejabberd you need: - GNU Make - GCC - libexpat 1.95 or higher - - Erlang/OTP R10B-9 up to R11B-5. Erlang R12 releases are not yet - officially supported, and are not recommended for production - servers + - Erlang/OTP R10B-9 or newer - OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL encryption. Optional, highly recommended. - Zlib 1.2.3 or higher, for Stream Compression support