Głąbek, Andrzej 3ff34ef58d Merge branch 'nordic_sdk_integration' into hal_improvements ... # Conflicts: # hal/targets.json		2016-06-28 12:13:50 +02:00
..
cmsis	Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration	2016-06-23 07:03:18 +02:00
hal	Merge branch 'nordic_sdk_integration' into hal_improvements	2016-06-28 12:13:50 +02:00