[asterisk-commits] kmoore: branch kmoore/channel-state-caching r381033 - in /team/kmoore/channel...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Feb  7 09:27:59 2013
New Revision: 381033

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381033
Log:
resolve conflict, enable automerge

Modified:
    team/kmoore/channel-state-caching/   (props changed)
    team/kmoore/channel-state-caching/include/asterisk/stringfields.h

Propchange: team/kmoore/channel-state-caching/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kmoore/channel-state-caching/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  7 09:27:59 2013
@@ -1,1 +1,1 @@
-/trunk:1-381002
+/trunk:1-381032

Modified: team/kmoore/channel-state-caching/include/asterisk/stringfields.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/channel-state-caching/include/asterisk/stringfields.h?view=diff&rev=381033&r1=381032&r2=381033
==============================================================================
--- team/kmoore/channel-state-caching/include/asterisk/stringfields.h (original)
+++ team/kmoore/channel-state-caching/include/asterisk/stringfields.h Thu Feb  7 09:27:59 2013
@@ -447,6 +447,8 @@
 				break; \
 			} \
 		} \
+	} else { \
+		__outer_res__ = -1; \
 	} \
 	__outer_res__; \
 })