[svn-commits] phsultan: branch phsultan/jingle-support r229870 - in /team/phsultan/jingle-s...

[SVN commits to the Digium repositories]

Author: phsultan
Date: Fri Nov 13 04:39:53 2009
New Revision: 229870

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229870
Log:
Reset automerge

Modified:
    team/phsultan/jingle-support/   (props changed)
    team/phsultan/jingle-support/main/loader.c

Propchange: team/phsultan/jingle-support/
------------------------------------------------------------------------------
    automerge = *

Modified: team/phsultan/jingle-support/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/jingle-support/main/loader.c?view=diff&rev=229870&r1=229869&r2=229870
==============================================================================
--- team/phsultan/jingle-support/main/loader.c (original)
+++ team/phsultan/jingle-support/main/loader.c Fri Nov 13 04:39:53 2009
@@ -854,9 +854,8 @@
 			/* Make sure we have the proper setting for the required field 
 			   (we might have both load= and required= lines in modules.conf) */
 				order->required |= required;
-			}
-			return NULL;
-		}
+		}
+		return NULL;
 	}
 
 	if (!(order = ast_calloc(1, sizeof(*order))))