Merge branch 'master' into wts

This commit is contained in:
Matt Hill
2014-07-03 13:36:27 -04:00

View File

@@ -84,7 +84,7 @@ int main( int argc, const char** argv )
if (pipeline_data.region_confidence <= 20) if (pipeline_data.region_confidence <= 20)
{ {
pipeline_data.region_code = 'zz'; pipeline_data.region_code = "zz";
pipeline_data.region_confidence = 100; pipeline_data.region_confidence = 100;
} }
else else