Alexey Shchepin 24ff98d50d Fixed conflict ... SVN Revision: 887		2007-08-24 16:18:46 +00:00
..
Makefile.in	* src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant)	2007-05-29 14:31:12 +00:00
Makefile.win32	* src/xml_stream.erl: Added catching of gen_fsm:send_event errors	2006-03-14 04:26:15 +00:00
mod_muc_log.erl	* src/mod_muc/mod_muc_log.erl: Recognise more URI schemes in logged HTML (EJAB-279) (Thanks to qu1j0t3).	2007-07-17 07:55:26 +00:00
mod_muc_room.erl	Fixed conflict	2007-08-24 16:18:46 +00:00
mod_muc.erl	* src/mod_muc/mod_muc.erl: Added default_room_options option	2007-08-02 02:30:25 +00:00