Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts: cpu/mc1322x/COPYING
This commit is contained in:
commit
2e331b51e8
9 changed files with 386 additions and 20 deletions
|
@ -30,7 +30,7 @@
|
|||
* This file is part of libmc1322x: see http://mc1322x.devl.org
|
||||
* for details.
|
||||
*
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
|
@ -42,7 +42,7 @@
|
|||
*
|
||||
* Created on : 17-mar-2009
|
||||
*
|
||||
* $Id$
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue