[svn-commits] oej: branch group/pinana-publish-1.4 r296392 - in /team/group/pinana-publish-...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Nov 26 15:42:41 2010
New Revision: 296392

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296392
Log:
We don't use underscores, oej.

Added:
    team/group/pinana-publish-1.4/configs/sip_presence.conf   (props changed)
      - copied unchanged from r296391, team/group/pinana-publish-1.4/configs/sip-presence.conf
Removed:
    team/group/pinana-publish-1.4/configs/sip-presence.conf
Modified:
    team/group/pinana-publish-1.4/channels/chan_sip.c

Modified: team/group/pinana-publish-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pinana-publish-1.4/channels/chan_sip.c?view=diff&rev=296392&r1=296391&r2=296392
==============================================================================
--- team/group/pinana-publish-1.4/channels/chan_sip.c (original)
+++ team/group/pinana-publish-1.4/channels/chan_sip.c Fri Nov 26 15:42:41 2010
@@ -235,7 +235,7 @@
 
 static const char config[] = "sip.conf";
 static const char notify_config[] = "sip_notify.conf";
-static const char presence_config[] = "sip-presence.conf";
+static const char presence_config[] = "sip_presence.conf";
 
 static const int DEFAULT_PUBLISH_EXPIRES = 3600;
 

Propchange: team/group/pinana-publish-1.4/configs/sip_presence.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/pinana-publish-1.4/configs/sip_presence.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/group/pinana-publish-1.4/configs/sip_presence.conf
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/configs/sip-presence.conf:228798

Propchange: team/group/pinana-publish-1.4/configs/sip_presence.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain