« Previous | Next » 

Revision 0aa71229

ID0aa71229314806120b2d2efe661c5d169dd0c166
Parent f0dd1ac4, 3ed0cc4d

Added by Thomas Schöpping about 1 year ago

Merge branch 'vl53l1x' of http://openresearch.cit-ec.de/git/amiro-os.amiro-lld into vl53l1x

  1. Conflicts:
  2. drivers/VL53L1X/v1/alld_VL53L1X.c
  3. drivers/VL53L1X/v1/alld_VL53L1X.h
  4. drivers/VL53L1X/v1/api/platform/vl53l1_platform_user_data.h
  5. drivers/VL53L1X/v1/api/platform/vl53l1_platform_user_defines.h

Files

  • added
  • modified
  • copied
  • renamed
  • deleted