0xc0170 edf015ad92 Merge branch 'master' into release ... Conflicts: tools/export/uvision4.py tools/export/uvision5.py		2016-07-19 08:44:34 +01:00
..
api	Merge branch 'master' into release	2016-07-19 08:44:34 +01:00
common	Merge pull request #2129 from jamike/Fix_for_#2124	2016-07-15 10:48:53 +01:00
hal	spi hal - specify default bit order	2016-06-16 15:31:17 +01:00
targets	Merge pull request #2128 from LMESTM/fix_F4_serial_it_issue2119	2016-07-15 15:21:49 +01:00
.yotta_ignore	Simplify layout:	2016-05-23 09:13:59 +01:00
CMakeLists.txt	Simplify layout:	2016-05-23 09:13:59 +01:00
module.json	Simplify layout:	2016-05-23 09:13:59 +01:00
targets.json	Merge branch 'master' into release	2016-07-19 08:44:34 +01:00