[asterisk-commits] phsultan: branch phsultan/jabberreceive r188900 - /team/phsultan/jabberreceive/

[SVN commits to the Asterisk project]

Author: phsultan
Date: Fri Apr 17 07:56:31 2009
New Revision: 188900

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188900
Log:
Resolve SVN conflict effectively

Modified:
    team/phsultan/jabberreceive/   (props changed)
    team/phsultan/jabberreceive/CHANGES

Propchange: team/phsultan/jabberreceive/
------------------------------------------------------------------------------
    automerge = *

Modified: team/phsultan/jabberreceive/CHANGES
URL: http://svn.digium.com/svn-view/asterisk/team/phsultan/jabberreceive/CHANGES?view=diff&rev=188900&r1=188899&r2=188900
==============================================================================
--- team/phsultan/jabberreceive/CHANGES (original)
+++ team/phsultan/jabberreceive/CHANGES Fri Apr 17 07:56:31 2009
@@ -222,22 +222,16 @@
  * The contrib/scripts/ directory now has a script called sip_nat_settings that will
    give you the correct output for an asterisk box behind nat. It will give you the
    externhost and localnet settings.
-<<<<<<< .working
- * SendText is now implemented in chan_gtalk and chan_jingle. It will simply send
-   XMPP text messages to the remote JID.
-=======
  * The Asterisk core now supports ITU G.722.1 and G.722.1C media streams, and
    can connect calls in passthrough mode, as well as record and play back files.
-<<<<<<< .working
->>>>>>> .merge-right.r176459
-=======
  * Successful and unsuccessful call pickup can now be alerted through sounds, by
    using pickupsound and pickupfailsound in features.conf.
  * ASTVARRUNDIR is now set to $(localstatedir)/run/asterisk by default. 
    This means the asterisk pid file will now be in /var/run/asterisk/asterisk.pid on LINUX
    instead of the /var/run/asterisk.pid where it used to be. This will make
    installs as non-root easier to manage.
->>>>>>> .merge-right.r188836
+ * SendText is now implemented in chan_gtalk and chan_jingle. It will simply send
+   XMPP text messages to the remote JID.
 
 Asterisk Manager Interface
 --------------------------