diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2006-01-24 02:55:44 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2006-01-24 02:55:44 +0000 |
| commit | 2d7fbf3964e5a152e84031a5e6c79ac9ec38aeea (patch) | |
| tree | 8b2c13e4789030470cda4c73654de12701496bdf | |
| parent | * src/ejabberd_sm.erl: Partially rewritten to work more (diff) | |
Fixed ChangeLog
SVN Revision: 489
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,4 +1,3 @@ -<<<<<<< .mine 2006-01-23 Alexey Shchepin <alexey@sevcom.net> * src/ejabberd_sm.erl: Partially rewritten to work more @@ -9,14 +8,12 @@ * src/mod_irc/mod_irc_connection.erl: Cleanup -======= 2006-01-20 Mickael Remond <mickael.remond@process-one.net> * src/ejabberd_receiver.erl: Added new debugging trace: It is now possible to dump the XML stream received from a client (usefull for client debugging). ->>>>>>> .r487 2006-01-19 Alexey Shchepin <alexey@sevcom.net> * src/aclocal.m4: Updated for zlib support |