[asterisk-commits] oej: branch oej/pinedanish-copybridgeflags-1.8 r363311 - in /team/oej/pinedan...

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Apr 24 02:09:43 2012
New Revision: 363311

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363311
Log:
Cleaning up

Modified:
    team/oej/pinedanish-copybridgeflags-1.8/Makefile
    team/oej/pinedanish-copybridgeflags-1.8/channels/chan_sip.c

Modified: team/oej/pinedanish-copybridgeflags-1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/Makefile?view=diff&rev=363311&r1=363310&r2=363311
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/Makefile (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/Makefile Tue Apr 24 02:09:43 2012
@@ -494,12 +494,8 @@
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
-<<<<<<< .working
-	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
-=======
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/moh"
->>>>>>> .merge-right.r362997
 	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"

Modified: team/oej/pinedanish-copybridgeflags-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-1.8/channels/chan_sip.c?view=diff&rev=363311&r1=363310&r2=363311
==============================================================================
--- team/oej/pinedanish-copybridgeflags-1.8/channels/chan_sip.c (original)
+++ team/oej/pinedanish-copybridgeflags-1.8/channels/chan_sip.c Tue Apr 24 02:09:43 2012
@@ -2948,7 +2948,7 @@
  * \note A reference to the dialog must be held before calling this function, and this
  * function does not release that reference.
  */
->>>>>>> .merge-right.r362997
+void dialog_unlink_all(struct sip_pvt *dialog)
 {
 	struct sip_pkt *cp;
 	struct ast_channel *owner;