[asterisk-commits] dlee: branch dlee/stasis-http r383780 - in /team/dlee/stasis-http: ./ apps/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Mar 25 16:02:13 2013
New Revision: 383780

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383780
Log:
Missed a res_json dep
........

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

Modified:
    team/dlee/stasis-http/   (props changed)
    team/dlee/stasis-http/apps/app_stasis.c

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 25 16:02:13 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-383772 /trunk:1-383765
+/team/dlee/stasis-app:1-383779 /trunk:1-383765

Modified: team/dlee/stasis-http/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/apps/app_stasis.c?view=diff&rev=383780&r1=383779&r2=383780
==============================================================================
--- team/dlee/stasis-http/apps/app_stasis.c (original)
+++ team/dlee/stasis-http/apps/app_stasis.c Mon Mar 25 16:02:13 2013
@@ -748,5 +748,4 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
 		"Stasis dialplan application",
 		.load = load_module,
-		.unload = unload_module,
-		.nonoptreq = "res_json");
+		.unload = unload_module);