[asterisk-commits] dlee: branch dlee/stasis-http r382279 - in /team/dlee/stasis-http: ./ main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Feb 28 13:44:25 2013
New Revision: 382279

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382279
Log:
Merged revisions 382272 via svnmerge from 
file:///srv/subversion/repos/asterisk/team/dlee/stasis-core

........
  r382272 | dlee | 2013-02-28 13:05:40 -0600 (Thu, 28 Feb 2013) | 1 line
  
  Export stasis_ symbol from asterisk main
........
........

Merged revisions 382273 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-app

Modified:
    team/dlee/stasis-http/   (props changed)
    team/dlee/stasis-http/main/asterisk.exports.in

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 28 13:44:25 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-382063
+/team/dlee/stasis-app:1-382278

Modified: team/dlee/stasis-http/main/asterisk.exports.in
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/main/asterisk.exports.in?view=diff&rev=382279&r1=382278&r2=382279
==============================================================================
--- team/dlee/stasis-http/main/asterisk.exports.in (original)
+++ team/dlee/stasis-http/main/asterisk.exports.in Thu Feb 28 13:44:25 2013
@@ -32,6 +32,7 @@
 		LINKER_SYMBOL_PREFIXdialed_interface_info;
 		LINKER_SYMBOL_PREFIXstrsep;
 		LINKER_SYMBOL_PREFIXsetenv;
+		LINKER_SYMBOL_PREFIXstasis_*;
 		LINKER_SYMBOL_PREFIXunsetenv;
 		LINKER_SYMBOL_PREFIXstrcasestr;
 		LINKER_SYMBOL_PREFIXstrnlen;