Merge remote branch 'origin/android_branch' into android_branch

Conflicts:
	xwords4/common/dictnry.c
	xwords4/common/dictnry.h
	xwords4/linux/linuxmain.c
This commit is contained in:
Eric House 2011-10-28 20:54:55 -07:00
commit f6ff3e85c6

View file

@ -783,7 +783,8 @@ prevWord( const DictionaryCtxt* dict, EdgeArray* edges )
while ( 0 < edges->nEdges && ! success ) {
if ( isFirstEdge( dict, edges->edges[edges->nEdges-1] ) ) {
--edges->nEdges;
success = 0 < edges->nEdges && ISACCEPTING( dict, edges->edges[edges->nEdges-1] );
success = 0 < edges->nEdges
&& ISACCEPTING( dict, edges->edges[edges->nEdges-1] );
continue;
}
edges->edges[edges->nEdges-1] -= dict->nodeSize;