Merge branch 'develop'

This commit is contained in:
Matthias Ringwald 2016-05-09 18:43:58 +02:00
commit 05695ae235

View File

@ -146,8 +146,8 @@ char char_for_nibble(int nibble){
int nibble_for_char(char c){
if (c >= '0' && c <= '9') return c - '0';
if (c >= 'a' && c <= 'f') return c - 'a';
if (c >= 'A' && c <= 'F') return c - 'F';
if (c >= 'a' && c <= 'f') return c - 'a' - 10;
if (c >= 'A' && c <= 'F') return c - 'A' - 10;
return -1;
}