master -> stable changelog manual merge

This commit is contained in:
Ross Owen
2016-03-09 15:18:04 +00:00
4 changed files with 26 additions and 21 deletions

View File

@@ -465,7 +465,7 @@
* @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
*/
#ifndef BCD_DEVICE_M
#define BCD_DEVICE_M 14
#define BCD_DEVICE_M 15
#endif
/**