Merge remote-tracking branch 'upstream/master' into MessengerLoadSave

This commit is contained in:
Coren[m] 2013-09-17 01:15:57 +02:00
commit aa71dea96d

View File

@ -1590,12 +1590,12 @@ static int messenger_load_state_callback(void *outer, uint8_t *data, uint32_t le
break; break;
default:
#ifdef DEBUG #ifdef DEBUG
default:
fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n", fprintf(stderr, "Load state: contains unrecognized part (len %u, type %u)\n",
length, type); length, type);
#endif
break; break;
#endif
} }
return 0; return 0;