Skip to content

Commit f2e1518

Browse files
author
Bogdan Marinescu
committed
Merge branch 'master' of git://github.com/Sissors/mbed into Sissors-master
Conflicts: libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogin_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogout_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/gpio_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/i2c_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/pinmap.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/pwmout_api.c
2 parents 2a782f5 + fb3fe60 commit f2e1518

File tree

104 files changed

+701
-3453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+701
-3453
lines changed

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/PortNames.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogin_api.c

Lines changed: 0 additions & 89 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogout_api.c

Lines changed: 0 additions & 88 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/gpio_api.c

Lines changed: 0 additions & 64 deletions
This file was deleted.

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/gpio_object.h

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)