[asterisk-commits] oej: branch 1.6.0 r168723 - in /branches/1.6.0: ./ configs/extconfig.conf.sample

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jan 15 12:52:54 2009
New Revision: 168723

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168723
Log:
Merged revisions 168722 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r168722 | oej | 2009-01-15 19:47:14 +0100 (Tor, 15 Jan 2009) | 10 lines

Merged revisions 168721 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168721 | oej | 2009-01-15 19:43:43 +0100 (Tor, 15 Jan 2009) | 2 lines

Meetme actually has realtime but wasn't documented

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/extconfig.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/extconfig.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/extconfig.conf.sample?view=diff&rev=168723&r1=168722&r2=168723
==============================================================================
--- branches/1.6.0/configs/extconfig.conf.sample (original)
+++ branches/1.6.0/configs/extconfig.conf.sample Thu Jan 15 12:52:54 2009
@@ -56,6 +56,7 @@
 ;sipregs => odbc,asterisk
 ;voicemail => odbc,asterisk
 ;extensions => odbc,asterisk
+;meetme => mysql,conferences
 ;queues => odbc,asterisk
 ;queue_members => odbc,asterisk
 ;musiconhold => mysql,asterisk