Matthew Lister / forktest

Dependencies:   X_NUCLEO_COMMON ST_INTERFACES

Files at this revision

API Documentation at this revision

Comitter:
Wolfgang Betz
Date:
Tue Jun 16 13:49:58 2015 +0200
Parent:
61:8eb4c09ae4cb
Parent:
59:842837a64895
Child:
65:c900ba2aa497
Commit message:
Merge branch 'master' of hg::http://wobetz@developer.mbed.org/teams/ST-Expansion-SW-Team/code/X_NUCLEO_IKS01A1 into iks01a1-split

Conflicts:
X_NUCLEO_COMMON.lib

Changed in this revision

--- a/X_NUCLEO_COMMON.lib	Tue Jun 16 13:41:02 2015 +0200
+++ b/X_NUCLEO_COMMON.lib	Tue Jun 16 13:49:58 2015 +0200
@@ -1,1 +1,1 @@
-http://developer.mbed.org/teams/ST-Expansion-SW-Team/code/X_NUCLEO_COMMON/#55d59a1605c3
+http://developer.mbed.org/teams/ST-Expansion-SW-Team/code/X_NUCLEO_COMMON/#527e203b709b