« Previous | Next » 

Revision 11d54cd3

ID11d54cd331d745f315c4ac149508988918486195
Parent 8d756b18, 2435f7a5
Child e7131d09

Added by Julian Leichert over 2 years ago

Merge branch 'rtcan' of https://openresearch.cit-ec.de/git/amiro-os.amiro-os into rtcan

  1. Conflicts:
  2. modules/PowerManagement_1-1/module.c
  3. modules/PowerManagement_1-1/module.h

Files

  • added
  • modified
  • copied
  • renamed
  • deleted