summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-01-15 16:09:07 +0000
committerBadlop <badlop@process-one.net>2008-01-15 16:09:07 +0000
commit983e51d5fbbc84fb81097c94173410074b07d27b (patch)
treecf0445ae6e96171a7819d3b89584879132b4afec
parent* ChangeLog: Update for Erlang R12 compilation (EJAB-446). (diff)
Merge changesets 1150 and 1151 into branch ejabberd-2.0.x:
* src/Makefile.in: Allow compilation with Erlang R12 (EJAB-446) (thanks to Sergei Golovan and Maxim Treskin). Erlang R12 version is not supported and not recommended for production servers. * src/aclocal.m4: Likewise * src/configure.ac: Likewise * src/configure: Likewise * src/ejabberd_s2s_in.erl: Likewise Small fixes in trunk/ChangeLog. SVN Revision: 1152
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f3d7a3a..f46c2547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2008-01-15 Jérôme Sautret <jerome.sautret@process-one.net>
- * src/Makefile.in: Allow compilation with Erlang R12 (EJAB-446),
- thanks to Sergei Golovan and Maxim Treskin. Erlang R12 version is
+ * src/Makefile.in: Allow compilation with Erlang R12 (EJAB-446)
+ (thanks to Sergei Golovan and Maxim Treskin). Erlang R12 version is
not supported and not recommended for production servers.
* src/aclocal.m4: Likewise
* src/configure.ac: Likewise