« Previous | Next » 

Revision 3a6cb755

ID3a6cb755d9e8802886acee7a01ec740cad95b7b8
Parent cca61a53, e2d7143f
Child 8543d0d9

Added by Thomas Schöpping over 2 years ago

Merge branch 'master' into stm32l4

  1. Conflicts:
  2. core/src/aos_main.cpp
  3. core/src/aos_system.c
  4. modules/PowerManagement_1-1/module.h
  5. modules/STM32F4Discovery/alldconf.h
  6. modules/STM32F4Discovery/aosconf.h
  7. modules/STM32F4Discovery/halconf.h
  8. modules/STM32F4Discovery/module.c
  9. modules/STM32F4Discovery/module.h
  10. tools/ide/QtCreator/QtCreatorSetup.sh

Files

  • added
  • modified
  • copied
  • renamed
  • deleted