aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Woestenberg <leon@sidebranch.com>2009-11-24 13:50:46 +0100
committerLeon Woestenberg <leon@sidebranch.com>2009-11-24 13:50:46 +0100
commit127101eaa412bd763881f53d5eb758ccf7c237e4 (patch)
treefab44b7084e498be645bac29a2484183c61866b9
parentd1e09d11e7020bab75cb725e50ed76577bf5b961 (diff)
parent8f0f6de70ca7d429984ca7dcfdba0bdd7f1303ac (diff)
downloadopenembedded-127101eaa412bd763881f53d5eb758ccf7c237e4.zip
openembedded-127101eaa412bd763881f53d5eb758ccf7c237e4.tar.gz
openembedded-127101eaa412bd763881f53d5eb758ccf7c237e4.tar.bz2
Merge branch 'likewise/nios2' of git@git.openembedded.org:openembedded into likewise/nios2likewise/nios2
Conflicts: recipes/uclibc/uclibc.inc Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
0 files changed, 0 insertions, 0 deletions