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

Conflicts:
	HD44780.cpp
This commit is contained in:
phl0 2016-04-16 11:55:47 +02:00
commit a853a8cad0
10 changed files with 31 additions and 25 deletions

View file

@ -160,7 +160,7 @@ void CHD44780::clearDStar()
}
}
void CHD44780::writeDMR(unsigned int slotNo, const char* src, bool group, unsigned int dstId, const char* type)
void CHD44780::writeDMR(unsigned int slotNo, const char* src, bool group, const char* dst, const char* type)
{
assert(src != NULL);
assert(type != NULL);